Merge branch 'master' into harmattan
authorLucian Horga <lucian@esdhcp042115.research.nokia.com>
Mon, 21 Mar 2011 09:07:53 +0000 (11:07 +0200)
committerLucian Horga <lucian@esdhcp042115.research.nokia.com>
Mon, 21 Mar 2011 09:07:53 +0000 (11:07 +0200)
commit52ed94a261967c75a614b53a139f1f8018ff9df1
tree63342b5db564b1051b0eb03d20a8f657fc57961e
parentb71b75dc10cff5816c97557a569b804e21094f04
parent8c410efb5d2d96dc52a90e4461a621463f7a1fd9
Merge branch 'master' into harmattan