Merge branch 'stable' into release
authorJohanna Aijala <johanna.aijala@digia.com>
Thu, 21 Feb 2013 07:38:02 +0000 (09:38 +0200)
committerJohanna Aijala <johanna.aijala@digia.com>
Thu, 21 Feb 2013 07:39:00 +0000 (09:39 +0200)
Change-Id: I29715c906d4d4dee985fdcfbae9a5d99c1a17997


Trivial merge