Merge branch '4.7-stable' of git://gitorious.org/qt/qt into 4.7-iphone
authorMark Kromis <greybird@mac.com>
Wed, 24 Nov 2010 10:46:07 +0000 (05:46 -0500)
committerMark Kromis <greybird@mac.com>
Wed, 24 Nov 2010 10:46:07 +0000 (05:46 -0500)
commit9bbac0c1223116109ea9f5f3aa92a78f61207c69
tree2ae8ac806520836c2402b3589bb2a7c9c9ae00b2
parentd0f951c5846b317a81d1a3fcd41314f6bc40bf6d
parentb1c412cefa51f0eea79dbf279f2a23414ccecc3d
Merge branch '4.7-stable' of git://gitorious.org/qt/qt into 4.7-iphone