Merge 'release' into stable
authorOswald Buddenhagen <oswald.buddenhagen@digia.com>
Wed, 19 Dec 2012 18:38:21 +0000 (19:38 +0100)
committerOswald Buddenhagen <oswald.buddenhagen@digia.com>
Wed, 19 Dec 2012 18:39:43 +0000 (19:39 +0100)
Change-Id: Ie325bf13e34736edf4118c8ee640e23b2f9270bf


Trivial merge