Merge remote-tracking branch 'origin/stable' into dev
authorFrederik Gladhorn <frederik.gladhorn@digia.com>
Wed, 27 Mar 2013 13:31:37 +0000 (14:31 +0100)
committerFrederik Gladhorn <frederik.gladhorn@digia.com>
Wed, 27 Mar 2013 13:31:38 +0000 (14:31 +0100)
Change-Id: I6b92013d9fb14b11141d1a15c183776b2b3309fa


Trivial merge