[soprano/f13/master: 29/29] Merge remote branch 'origin/master' into f13/master

[Rex Dieter]

commit da1dfada0ef00830bf5190911c9332f56dd3c54a
Merge: b475bcf a094035
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Thu Oct 21 10:45:44 2010 -0500

    Merge remote branch 'origin/master' into f13/master
    
    Conflicts:
    	.gitignore
    	soprano.spec
    	sources

 .gitignore                 |    4 ++-
 soprano-2.4.4-qdebug.patch |   11 ------
 soprano.spec               |   77 ++++++++++++++++++++++++++++++++-----------
 sources                    |    2 +-
 4 files changed, 61 insertions(+), 33 deletions(-)
---