[qtcurve-gtk2/f15/master: 16/16] Merge branch 'master' into f15

[Jaroslav Reznik]

commit 38601c7df61369b2a67894449816c28dc9a6785d
Merge: 75bfd4f d0a38ee
Author: Jaroslav Reznik <jreznik at redhat.com>
Date:   Tue Mar 22 10:43:30 2011 +0100

    Merge branch 'master' into f15
    
    Conflicts:
    	qtcurve-gtk2.spec

 qtcurve-gtk2-fix-threading-crash.patch |   28 ++++++++++++++++++++++++++++
 qtcurve-gtk2.spec                      |   20 ++++++++++++++------
 2 files changed, 42 insertions(+), 6 deletions(-)
---