[virtuoso-opensource/el5/master: 12/12] Merge remote branch 'origin/el6/master' into el5/master

[Rex Dieter]

commit 841e6779aa69709ad37ee17c38ee2bdc8f7b8f63
Merge: cf24097 2cca2e8
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Fri Jan 14 07:29:25 2011 -0600

    Merge remote branch 'origin/el6/master' into el5/master
    
    Conflicts:
    	virtuoso-opensource.spec

 .gitignore               |    3 +--
 sources                  |    2 +-
 virtuoso-opensource.spec |   18 ++++++++++--------
 3 files changed, 12 insertions(+), 11 deletions(-)
---