From: con <qtc-committer@nokia.com>
Date: Fri, 29 Apr 2011 08:27:58 +0000 (+0200)
Subject: Merge remote branch 'origin/2.2'
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=1689a2cded9613934b6258ee062bdbb6cb63e976;p=qt-creator-jp%2Fqt-creator-jp.git

Merge remote branch 'origin/2.2'

Conflicts:
	qtcreator.pri
---

1689a2cded9613934b6258ee062bdbb6cb63e976