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

[Rex Dieter]

commit f5a3dce4f2954b4f594f2ba1918e2eb65e5ad81d
Merge: 627dd45 9eab49e
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Wed Sep 14 12:30:04 2011 -0500

    Merge branch 'master' into f15

 virtuoso-opensource-6.1.3-encoding.patch |   21 +++++++++++++++++++++
 virtuoso-opensource.spec                 |   12 +++++++++++-
 2 files changed, 32 insertions(+), 1 deletions(-)
---