Merge branch '4.7-upstream' into 4.7-water
authorThierry Bastian <thierry.bastian@nokia.com>
Thu, 25 Nov 2010 23:00:14 +0000 (00:00 +0100)
committerThierry Bastian <thierry.bastian@nokia.com>
Thu, 25 Nov 2010 23:00:14 +0000 (00:00 +0100)
commit41b455303b83d07cbffbddbee8d3898d6d81f62a
treedd3ffef48258573b7b362ee80a98dc42937d1dc7
parent7be365682055db5791e5854d9695c62b942205ab
parentc2f6fe50c06e4285085db17ea3a9d9254cf21f48
Merge branch '4.7-upstream' into 4.7-water