Merge remote-tracking branch 'origin/release' into stable
authorFrederik Gladhorn <frederik.gladhorn@digia.com>
Tue, 25 Jun 2013 21:27:28 +0000 (23:27 +0200)
committerFrederik Gladhorn <frederik.gladhorn@digia.com>
Tue, 25 Jun 2013 21:27:28 +0000 (23:27 +0200)
Change-Id: I9ad818eecef74983e09660871f39ee66a6b666a1


Trivial merge