Merge branch 'svnup' of http://netz.smurf.noris.de/git/git

Signed-off-by: Junio C Hamano <junkio@cox.net>

diff --cc debian/control
index 3935e33f4d1af0c75585ed47db1b3684f163eae8,965fb6281b5193da9d2a44ff9b2443e0e1a52eb4..ded0a576d6a39f48a68bd470c7528dd61af6927f
--- 1/debian/control
--- 2/debian/control
+++ b/debian/control
@@@ -2,7 -2,7 +2,7 @@@ Source: git-cor
  Section: devel
  Priority: optional
  Maintainer: Junio C Hamano <junkio@cox.net>
- Build-Depends-Indep: libz-dev, libssl-dev, libcurl3-dev|libcurl3-gnutls-dev|libcurl3-openssl-dev, asciidoc (>= 6.0.3), xmlto, debhelper (>= 4.0.0), bc, libexpat1-dev
 -Build-Depends-Indep: libz-dev, libssl-dev, libcurl3-dev|libcurl3-gnutls-dev|libcurl3-openssl-dev, asciidoc (>= 7), xmlto, debhelper (>= 4.0.0), bc
++Build-Depends-Indep: libz-dev, libssl-dev, libcurl3-dev|libcurl3-gnutls-dev|libcurl3-openssl-dev, asciidoc (>= 7), xmlto, debhelper (>= 4.0.0), bc, libexpat-dev
  Standards-Version: 3.6.1
  
  Package: git-core