Merge remote-tracking branch 'origin/release' into stable
authorFrederik Gladhorn <frederik.gladhorn@digia.com>
Thu, 4 Jul 2013 13:28:40 +0000 (15:28 +0200)
committerFrederik Gladhorn <frederik.gladhorn@digia.com>
Thu, 4 Jul 2013 13:28:40 +0000 (15:28 +0200)
Change-Id: If58a09c4ed878ed7a1a350036ab1cc2e99a907f1


Trivial merge