Merge branch 'master' into 1.2.0 v1.2.0
authorEckhart Koppen <eckhart.koppen@nokia.com>
Wed, 20 Apr 2011 08:52:57 +0000 (11:52 +0300)
committerEckhart Koppen <eckhart.koppen@nokia.com>
Wed, 20 Apr 2011 08:52:57 +0000 (11:52 +0300)
commitfb3e9bc2d941462f1244aaf0ea79425a307f883d
treeafce91959098ec887ce466abc6e40342261df3db
parentc61d909c7b815319e40ba27d7f84e92aa5f1f946
parent6f0dc7cc40dd63763a581a7fb6d4e76649b8026c
Merge branch 'master' into 1.2.0