Merge branch '4.8' into earth-staging-master
authorSinan Tanilkan <sinan.tanilkan@nokia.com>
Wed, 21 Sep 2011 11:45:02 +0000 (13:45 +0200)
committerSinan Tanilkan <sinan.tanilkan@nokia.com>
Wed, 21 Sep 2011 11:45:02 +0000 (13:45 +0200)
commit160b82950ec53d3a0392df0fd18ac6856bfecbcf
tree1bdae6efe3fbcb7f25e0ce91884f83e1cdf68189
parent8ba781b01e900148fec2e9d26485369b3295487f
parent085bd7cf2d76f9acd548120f859201b014970a72
Merge branch '4.8' into earth-staging-master

Conflicts:
dist/changes-4.8.0
dist/changes-4.8.0