Merge commit 'juri/riku-devel'
authorRiku Voipio <riku.voipio@nokia.com>
Fri, 22 May 2009 14:25:00 +0000 (17:25 +0300)
committerRiku Voipio <riku.voipio@nokia.com>
Fri, 22 May 2009 14:25:00 +0000 (17:25 +0300)

Trivial merge