[virtuoso-opensource/f15: 2/2] Merge remote-tracking branch 'origin/master' into f15

[Rex Dieter]

commit 627dd45e33a92a444c1f7ccfb7677073d543c864
Merge: 9fc68b1 c531a24
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Fri Aug 5 08:21:03 2011 -0500

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

 .gitignore               |    3 ++-
 sources                  |    2 +-
 virtuoso-opensource.spec |   40 ++++++++++++++++++++++++----------------
 3 files changed, 27 insertions(+), 18 deletions(-)
---