Merge remote-tracking branch 'origin/release' into stable
authorFrederik Gladhorn <frederik.gladhorn@digia.com>
Fri, 31 May 2013 11:49:48 +0000 (13:49 +0200)
committerFrederik Gladhorn <frederik.gladhorn@digia.com>
Fri, 31 May 2013 11:49:48 +0000 (13:49 +0200)
Change-Id: I9c98f8277a31aa84e447262ae6745180880d4d2c


Trivial merge