Merge branch 'master' into stable
authorOswald Buddenhagen <oswald.buddenhagen@digia.com>
Mon, 3 Dec 2012 20:57:28 +0000 (21:57 +0100)
committerOswald Buddenhagen <oswald.buddenhagen@digia.com>
Mon, 3 Dec 2012 20:58:14 +0000 (21:58 +0100)
Change-Id: I5c0c9a131cca64fea3bc784339d14d84076edc1a


Trivial merge