Merge commit 'juri/juha-devel'
authorRiku Voipio <riku.voipio@nokia.com>
Fri, 17 Apr 2009 08:24:45 +0000 (11:24 +0300)
committerRiku Voipio <riku.voipio@nokia.com>
Fri, 17 Apr 2009 08:24:45 +0000 (11:24 +0300)

Trivial merge