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


Trivial merge