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)
commit3d76e16295dff7f4179d4b3969137ee2809798f9
tree446196f13f2c968a3242cfb0d86639bd58b0d4f5
parent517662c83ece13cd2972b226628192dc6e2dc548
parent212fb09c2b171d1df83692f21fdade17677b1167
Merge remote branch 'origin/2.1'