Merge branch '4.7-upstream' into 4.7-water
authorThierry Bastian <thierry.bastian@nokia.com>
Wed, 15 Dec 2010 23:00:13 +0000 (00:00 +0100)
committerThierry Bastian <thierry.bastian@nokia.com>
Wed, 15 Dec 2010 23:00:13 +0000 (00:00 +0100)
commit310473ac82a85735f576796f6784fdbe56370256
treef252a0e8f89442006f5f25395144aecf029acf23
parent4a56fbd816dd4d1ec7643735e549bb39c4ace4c6
parent540f6c3ef8ac8a3e959a49bf5d356c84d6f0ec1b
Merge branch '4.7-upstream' into 4.7-water