Merge remote-tracking branch 'origin/dev' into stable
authorFrederik Gladhorn <frederik.gladhorn@digia.com>
Fri, 22 Mar 2013 15:27:17 +0000 (16:27 +0100)
committerFrederik Gladhorn <frederik.gladhorn@digia.com>
Fri, 22 Mar 2013 15:28:32 +0000 (16:28 +0100)
These two patches should have targeted 5.1 and went in just
at the wrong time.

Change-Id: Idd0a7a812fb11e2aea2c187d5e82aa31494c576c


Trivial merge