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

[Rex Dieter]

commit d847f00714d310a19b82022d7bd74229f21099e4
Merge: 33cc331 2a7acaf
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Wed Jan 18 12:29:12 2012 -0600

    Merge branch 'master' into f15

 virtuoso-opensource-6.1.4-no_strip.patch |   14 ++++++++++
 virtuoso-opensource.spec                 |   42 ++++++++++++++++++++---------
 2 files changed, 43 insertions(+), 13 deletions(-)
---