Merge branch 'stable' into release
authorSergio Ahumada <sergio.ahumada@digia.com>
Wed, 9 Jan 2013 08:24:58 +0000 (09:24 +0100)
committerSergio Ahumada <sergio.ahumada@digia.com>
Wed, 9 Jan 2013 08:25:13 +0000 (09:25 +0100)
commitf213905ad6a755da57a8af904aa9c46ce9d7faca
treec64e59884996b053dafef8892b41cc501004fa6b
parentbb08129989ecf91a6f1acffa6e005d20c5ee44af
parent897bec4496cf8090c19b18715e254a0713cfada2
Merge branch 'stable' into release

Change-Id: I00358ee7fb55d5cc5537c3935a4de611c2381545