Merge commit 'garage/master' master
authorJukka Rissanen <jukka.rissanen@nokia.com>
Wed, 8 Jul 2009 08:56:11 +0000 (11:56 +0300)
committerJukka Rissanen <jukka.rissanen@nokia.com>
Wed, 8 Jul 2009 08:56:11 +0000 (11:56 +0300)

Trivial merge