[qt/f13/master: 2/2] Merge remote branch 'origin/master' into f13/master

[Rex Dieter]

commit 4fbd7665ff84d898bf85941a201ee33bcd8a6766
Merge: b474a02 fdfba67
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Sun Oct 17 14:17:57 2010 -0500

    Merge remote branch 'origin/master' into f13/master

 qt-everywhere-opensource-src-4.7.0-bpp24.patch |   15 +++++++++++++++
 qt.spec                                        |    9 ++++++++-
 2 files changed, 23 insertions(+), 1 deletions(-)
---