[websvn/el6/master: 7/7] Merge branch 'master' into el6

[Xavier Bachelot]

commit b405848512920337d87e07b47c348b26361769d6
Merge: 878e5f4 6e8e6da
Author: Xavier Bachelot <xavier at bachelot.org>
Date:   Wed Sep 29 22:01:57 2010 +0200

    Merge branch 'master' into el6
    
    Conflicts:
    	.gitignore
    	websvn.spec

 websvn.spec |   32 +++++++++++++++++++++++++++++++-
 1 files changed, 31 insertions(+), 1 deletions(-)
---