Merge remote-tracking branch 'origin/stable' into dev
authorFrederik Gladhorn <frederik.gladhorn@digia.com>
Tue, 23 Jul 2013 09:14:35 +0000 (11:14 +0200)
committerFrederik Gladhorn <frederik.gladhorn@digia.com>
Tue, 23 Jul 2013 09:14:36 +0000 (11:14 +0200)
Change-Id: If52332b72560d21069e24cd31b13f08f33e1f406


Trivial merge