Merge commit 'juri/juha-devel' into real-master
authorRiku Voipio <riku.voipio@nokia.com>
Wed, 1 Apr 2009 15:44:49 +0000 (18:44 +0300)
committerRiku Voipio <riku.voipio@nokia.com>
Wed, 1 Apr 2009 15:44:49 +0000 (18:44 +0300)

Trivial merge