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)
commit705bf6326a6557323dfcd3c3183c9095f6ed178a
tree91542ce952ace17accc662c8193585d87b8da720
parentfede264eea962e83abe1649c538232b9a8a109f5
parentcb09b490b9b101ab7af40443b528a6d76ff0308b
Merge commit 'juri/riku-devel'