Merge branch 'stable' into release
authorJohanna Aijala <johanna.aijala@digia.com>
Thu, 21 Feb 2013 07:17:06 +0000 (09:17 +0200)
committerJohanna Aijala <johanna.aijala@digia.com>
Thu, 21 Feb 2013 07:21:34 +0000 (09:21 +0200)
Change-Id: I13e80072db1e2c14a37b6a123276be81b085e87e


Trivial merge