Merge branch 'master' of https://vcs.maemo.org/git/tomamp
authortmarki <tmarki@gmail.com>
Fri, 20 Aug 2010 17:04:18 +0000 (19:04 +0200)
committertmarki <tmarki@gmail.com>
Fri, 20 Aug 2010 17:04:18 +0000 (19:04 +0200)

Trivial merge