[cvs2svn/el6/master: 6/6] Update el6 to match master prior to first el6 build

[Mark Chappell]

commit f395704cce0ee8f445c0bd661c981e1277c94601
Merge: 1a29554 349e316
Author: Mark Chappell <tremble at fedoraproject.org>
Date:   Fri Sep 17 09:19:27 2010 +0200

    Update el6 to match master prior to first el6 build

 .gitignore   |    2 +-
 cvs2svn.spec |  106 ++++++++++++++++++++++++++++++++++++++++++++++++++-------
 sources      |    2 +-
 3 files changed, 95 insertions(+), 15 deletions(-)
---