OSDN Git Service

Merge remote branch 'origin/2.1'
authorcon <qtc-committer@nokia.com>
Fri, 4 Feb 2011 11:48:29 +0000 (12:48 +0100)
committercon <qtc-committer@nokia.com>
Fri, 4 Feb 2011 11:48:29 +0000 (12:48 +0100)

Trivial merge