Merge branch 'holger/qt4-4.7'
authorHolger Hans Peter Freyther <zecke@selfish.org>
Sat, 25 Sep 2010 16:09:37 +0000 (00:09 +0800)
committerHolger Hans Peter Freyther <zecke@selfish.org>
Sat, 25 Sep 2010 16:09:37 +0000 (00:09 +0800)

Trivial merge