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

[Xavier Bachelot]

commit 0e60a5895fca16de7ef61f2eaae1bf3d6d87bab7
Merge: 322784d 6e8e6da
Author: Xavier Bachelot <xavier at bachelot.org>
Date:   Wed Sep 29 21:57:03 2010 +0200

    Merge branch 'master' into f12
    
    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(-)
---