Merge remote-tracking branch 'qt-master/master'
authorEckhart Koppen <eckhart.koppen@nokia.com>
Wed, 6 Apr 2011 12:36:15 +0000 (15:36 +0300)
committerEckhart Koppen <eckhart.koppen@nokia.com>
Wed, 6 Apr 2011 12:36:15 +0000 (15:36 +0300)
commit470ae2d9da3bdda0dee4530616e1fdd5f9f00146
tree84cd79f817b333fb143486d7e994292cd99017d1
parentc20dbae2860d1ec681be50f161792c6aede08b1b
parent38a0780a51123e63b9b5087732bd5078a1bd68ef
Merge remote-tracking branch 'qt-master/master'