Merge "Merge remote-tracking branch 'origin/master' into api_changes" into refs/stagi...
authorJoão Abecasis <joao.abecasis@nokia.com>
Mon, 12 Mar 2012 22:52:36 +0000 (23:52 +0100)
committerQt by Nokia <qt-info@nokia.com>
Mon, 12 Mar 2012 22:52:36 +0000 (23:52 +0100)

Trivial merge