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

[Rex Dieter]

commit 0edc7429a083c51739ae7d9d177299d06ed46b06
Merge: 2206fbb ce9fd70
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Fri Nov 4 08:03:12 2011 -0500

    Merge branch 'master' into f14

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