Merge remote-tracking branch 'origin/release' into stable
authorFrederik Gladhorn <frederik.gladhorn@digia.com>
Fri, 28 Jun 2013 17:18:39 +0000 (19:18 +0200)
committerFrederik Gladhorn <frederik.gladhorn@digia.com>
Fri, 28 Jun 2013 17:18:54 +0000 (19:18 +0200)
Change-Id: I140852ef7fbbfe303dac620af5e6eba5ee3a4b02


Trivial merge