[websvn/f13/master: 6/6] Merge branch 'master' into f13

[Xavier Bachelot]

commit 06b05db31d4ba86c56999663a6b6a132a7996ada
Merge: 1652d2f 6e8e6da
Author: Xavier Bachelot <xavier at bachelot.org>
Date:   Wed Sep 29 21:55:10 2010 +0200

    Merge branch 'master' into f13
    
    Conflicts:
    	.gitignore

 sources                            |    2 +-
 websvn-2.2.0-use_system_libs.patch |   45 ------------------------------------
 websvn-2.3.1-use_system_libs.patch |   33 ++++++++++++++++++++++++++
 websvn.spec                        |   40 ++++++++++++++++++++++++++++---
 4 files changed, 70 insertions(+), 50 deletions(-)
---