Merge branch '4.7-upstream' into 4.7-water
authorThierry Bastian <thierry.bastian@nokia.com>
Thu, 23 Dec 2010 23:00:13 +0000 (00:00 +0100)
committerThierry Bastian <thierry.bastian@nokia.com>
Thu, 23 Dec 2010 23:00:13 +0000 (00:00 +0100)
commit8ff74f9008b8846624a9da299beb23949af7c249
tree18be776689556fadb56a81fd4910b40ff76c9496
parent8565d6d123227615312a791ae7acc5b252db264a
parent08f963176b24c4c20a96717ddb2241ba1410b0a1
Merge branch '4.7-upstream' into 4.7-water