Merge branch 'master' into harmattan
authorTomi Suviola <tomi.suviola@nokia.com>
Fri, 16 Sep 2011 10:38:49 +0000 (13:38 +0300)
committerTomi Suviola <tomi.suviola@nokia.com>
Fri, 16 Sep 2011 10:38:49 +0000 (13:38 +0300)
commitb3223a421f1b953b04f035d718ba1c714f5ce068
tree5257e540498fe723bd83e321a8b2cd1cf7dae692
parent7bbb2d796815ecbe4b0ad62deab6b1319ccf839a
parent246754e2f1d7c95817bea5020a47711480b879d1
Merge branch 'master' into harmattan