[qt-mobility/el6: 7/8] Merge branch 'origin/master' (early part) into el6

[Rex Dieter]

commit 7acd80bd90be312041373e687971df94b0334da2
Merge: 58f2dda 9df3eb0
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Mon May 23 13:46:22 2011 -0500

    Merge branch 'origin/master' (early part) into el6
    
    Conflicts:
    	.gitignore

 ...ility-opensource-src-1.1.0-pulseaudio-lib.patch |   11 +
 ...lity-opensource-src-1.1.0-translationsdir.patch |   11 +
 qt-mobility.spec                                   |  235 ++++++++++++++++++++
 sources                                            |    1 +
 4 files changed, 258 insertions(+), 0 deletions(-)
---