Merge branch '4.7-upstream' into 4.7-water
authorThierry Bastian <thierry.bastian@nokia.com>
Thu, 18 Nov 2010 23:00:13 +0000 (00:00 +0100)
committerThierry Bastian <thierry.bastian@nokia.com>
Thu, 18 Nov 2010 23:00:13 +0000 (00:00 +0100)
commit72378ce571bcb88d0519a1b02d0e543b5237d613
treefdeaccf101b09bab92b04765e248c3577acea3f2
parent31f3a80da7be630ced9c7038fa979cc324917153
parent4082e4711a1c54947429b15504caf778c6da22d0
Merge branch '4.7-upstream' into 4.7-water