Merge commit 'juri/juha-devel'
authorRiku Voipio <riku.voipio@nokia.com>
Thu, 2 Apr 2009 15:22:16 +0000 (18:22 +0300)
committerRiku Voipio <riku.voipio@nokia.com>
Thu, 2 Apr 2009 15:22:16 +0000 (18:22 +0300)

Trivial merge