Merge branch 'holger/qt4-4.7'
authorHolger Hans Peter Freyther <zecke@selfish.org>
Tue, 28 Sep 2010 10:55:23 +0000 (18:55 +0800)
committerHolger Hans Peter Freyther <zecke@selfish.org>
Tue, 28 Sep 2010 10:55:23 +0000 (18:55 +0800)

Trivial merge