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)
commitbc87a9493f433f5f57f5ab1c49c8798f4f8ab01d
treedd30e703fac482fa73de1a4a31394b315e641cb3
parenta1947ff31251f29b188bf2eb936c5c7a50aadca6
parent1fea78d913232c422d285352e4a2cdd2bc28a688
Merge commit 'juri/juha-devel' into real-master