Merge remote-tracking branch 'origin/stable' into dev
authorFrederik Gladhorn <frederik.gladhorn@digia.com>
Fri, 4 Jan 2013 12:22:16 +0000 (13:22 +0100)
committerFrederik Gladhorn <frederik.gladhorn@digia.com>
Fri, 4 Jan 2013 12:24:12 +0000 (13:24 +0100)
Conflicts:
sync.profile

Change-Id: I450b86e3d01498aca12fe11a28527a296f2cbc3f


Trivial merge