Merge remote-tracking branch 'origin/stable' into dev
authorFrederik Gladhorn <frederik.gladhorn@digia.com>
Fri, 12 Apr 2013 10:54:15 +0000 (12:54 +0200)
committerFrederik Gladhorn <frederik.gladhorn@digia.com>
Fri, 12 Apr 2013 10:54:28 +0000 (12:54 +0200)
Change-Id: I4804a63ccf83eb63fd7b4fe19be7953ef80138d5


Trivial merge