Merge branch 'riku-devel' into maemo-test
authorRiku Voipio <riku.voipio@nokia.com>
Thu, 5 Mar 2009 09:15:03 +0000 (11:15 +0200)
committerRiku Voipio <riku.voipio@nokia.com>
Thu, 5 Mar 2009 09:15:03 +0000 (11:15 +0200)

Trivial merge