Merge branch 'master' into harmattan
authorAlberto Mardegan <alberto.mardegan@nokia.com>
Wed, 1 Jun 2011 08:59:30 +0000 (11:59 +0300)
committerAlberto Mardegan <alberto.mardegan@nokia.com>
Wed, 1 Jun 2011 08:59:30 +0000 (11:59 +0300)
commit199e9dba5fca8277e780e37b4c6c6f3ce8cf472d
tree1c4be603152917594415fd5bfdfca62dc96fa2e6
parent7d798e8c192b8bec786e9a31397ffc8c80dc882d
parentc46351ff38fe750b2e18c965af94a20fb1516dbb
Merge branch 'master' into harmattan