[virtuoso-opensource/f14: 12/12] Merge branch 'f15' into f14

[Rex Dieter]

commit 2206fbbac42af0d08dcdc57236925acc9ba3d9fa
Merge: bf42122 f5a3dce
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Sat Oct 15 15:30:22 2011 -0500

    Merge branch 'f15' into f14
    
    Conflicts:
    	virtuoso-opensource.spec

 .gitignore                               |    3 +-
 sources                                  |    2 +-
 virtuoso-opensource-6.1.3-encoding.patch |   21 ++++++++++++++++
 virtuoso-opensource.spec                 |   38 ++++++++++++++++++++++--------
 4 files changed, 52 insertions(+), 12 deletions(-)
---