[soprano/f16: 5/5] Merge branch 'master' into f16

[Rex Dieter]

commit 3c27c4ab6bb50ed79824a57c8917394c55ad5a56
Merge: 341764d 0cf7842
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Wed Nov 2 09:09:12 2011 -0500

    Merge branch 'master' into f16
    
    Conflicts:
    	soprano.spec

 .gitignore                  |    2 +-
 soprano-2.7.2-version.patch |   12 ------------
 soprano.spec                |   18 ++++++++++--------
 sources                     |    2 +-
 4 files changed, 12 insertions(+), 22 deletions(-)
---