Merge remote-tracking branch 'origin/release' into stable
authorFrederik Gladhorn <frederik.gladhorn@digia.com>
Tue, 12 Mar 2013 10:31:49 +0000 (11:31 +0100)
committerFrederik Gladhorn <frederik.gladhorn@digia.com>
Tue, 12 Mar 2013 12:15:36 +0000 (13:15 +0100)
Change-Id: Ia4e3edead13e2526a77133e7067e649784fd1358


Trivial merge