Merge commit 'garage/master' maemo-0.19
authorJukka Rissanen <jukka.rissanen@nokia.com>
Wed, 24 Jun 2009 18:32:05 +0000 (21:32 +0300)
committerJukka Rissanen <jukka.rissanen@nokia.com>
Wed, 24 Jun 2009 18:32:05 +0000 (21:32 +0300)

Trivial merge