[virtuoso-opensource/el6/master: 17/17] Merge remote branch 'origin/f14/master' into el6/master

[Rex Dieter]

commit 2cca2e8f1f956e958d8ebb387bbceac3fcd3f82f
Merge: 262e67f bf42122
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Fri Jan 14 07:27:44 2011 -0600

    Merge remote branch 'origin/f14/master' into el6/master
    
    Conflicts:
    	virtuoso-opensource-6.1.0-external_iodbc.patch
    	virtuoso-opensource.spec

 virtuoso-opensource-6.1.0-external_iodbc.patch |   21 --------
 virtuoso-opensource.spec                       |   60 ++++++++++++++++-------
 2 files changed, 42 insertions(+), 39 deletions(-)
---