Merge remote-tracking branch 'origin/stable' into dev
authorFrederik Gladhorn <frederik.gladhorn@digia.com>
Thu, 27 Jun 2013 11:00:59 +0000 (13:00 +0200)
committerFrederik Gladhorn <frederik.gladhorn@digia.com>
Thu, 27 Jun 2013 11:00:59 +0000 (13:00 +0200)
Change-Id: I8ced3d911cec321949dd8b160447792ef9bbd3c3


Trivial merge