[virtuoso-opensource/f15: 8/8] Merge branch 'master' into f15

[Rex Dieter]

commit 33cc3317dea958115108e25f9a77f9850909c723
Merge: f5a3dce ce9fd70
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Wed Nov 2 14:03:15 2011 -0500

    Merge branch 'master' into f15

 .gitignore                               |    1 +
 sources                                  |    2 +-
 virtuoso-opensource-6.1.3-encoding.patch |   21 -----------------
 virtuoso-opensource.spec                 |   36 ++++++++++++++++++++----------
 4 files changed, 26 insertions(+), 34 deletions(-)
---