Merge remote-tracking branch 'origin/release' into stable
authorFrederik Gladhorn <frederik.gladhorn@digia.com>
Thu, 20 Jun 2013 14:19:07 +0000 (16:19 +0200)
committerFrederik Gladhorn <frederik.gladhorn@digia.com>
Thu, 20 Jun 2013 14:19:07 +0000 (16:19 +0200)
Change-Id: I6e22c4ce74e71c41ff43eb0403dab7193df4d0d8


Trivial merge