Merge branch 'master' into harmattan
authorAlberto Mardegan <alberto.mardegan@nokia.com>
Fri, 4 Feb 2011 10:36:22 +0000 (12:36 +0200)
committerAlberto Mardegan <alberto.mardegan@nokia.com>
Fri, 4 Feb 2011 10:36:22 +0000 (12:36 +0200)
commitc98b686d76dce5d9c62135d0cada44943fca60fd
tree40e2f9e8bb437d5cf92ddca08fbb1cb2dc4346d4
parentca0371be33fe4d3d62f512cec2c050b32b854477
parentee604587bdf7c57a88dbb9a4e50e576cf17e32ab
Merge branch 'master' into harmattan