[soprano/f14/master: 14/14] Merge remote-tracking branch 'origin/f15/master' into f14/master

[Rex Dieter]

commit 3530adb5b2ec41bd81218e2137fb56be972c9eb3
Merge: 81f295b cc78954
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Fri Mar 11 10:40:26 2011 -0600

    Merge remote-tracking branch 'origin/f15/master' into f14/master
    
    Conflicts:
    	.gitignore
    	soprano.spec
    	sources

 .gitignore                 |    2 +-
 soprano-2.5.63-rpath.patch |   16 +++++++++++
 soprano.spec               |   65 +++++++++++++++++++++++++++++--------------
 sources                    |    2 +-
 4 files changed, 62 insertions(+), 23 deletions(-)
---