Merge branch 'dev' of git://gitorious.org/qt/qtdeclarative into wip/v4
authorLars Knoll <lars.knoll@digia.com>
Fri, 9 Aug 2013 11:59:22 +0000 (13:59 +0200)
committerLars Knoll <lars.knoll@digia.com>
Fri, 9 Aug 2013 11:59:57 +0000 (13:59 +0200)
Change-Id: Iaf5c134e8c6fa27ef17dcf85d8bd5ccd896c7b9d


Trivial merge