Merge branch 'cbrake/qt-4.7.0' into org.openembedded.dev
authorCliff Brake <cbrake@bec-systems.com>
Thu, 23 Sep 2010 14:35:51 +0000 (10:35 -0400)
committerCliff Brake <cbrake@bec-systems.com>
Thu, 23 Sep 2010 14:35:51 +0000 (10:35 -0400)

Trivial merge