Merge branch 'stable' into release
authorJohanna Aijala <johanna.aijala@digia.com>
Thu, 21 Feb 2013 07:54:09 +0000 (09:54 +0200)
committerJohanna Aijala <johanna.aijala@digia.com>
Thu, 21 Feb 2013 07:55:02 +0000 (09:55 +0200)
commit6f51022d85cbdb1e2d741aee193eac3619466efc
treec54234378ca15b487a97f272036ca206f616c63c
parent6d8a2a8e743ffd52833617d2dbedb06de62557ff
parent3864fb8cd69773adaec9b9364ac7ad85a439407b
Merge branch 'stable' into release

Change-Id: I05e0c7370b5485e2cdea6f72551b19c017659a78