Merge branch 'master' of ssh://jht@git.samba.org/data/git/samba
authorJohn H Terpstra <jht@samba.org>
Thu, 23 Jul 2009 14:33:06 +0000 (09:33 -0500)
committerJohn H Terpstra <jht@samba.org>
Thu, 23 Jul 2009 14:33:06 +0000 (09:33 -0500)
commit94717ae8e5dfe2ccdb7f3557d5490708b00ae471
treea39f669faf23ad05497963cf5ccf611467d0145b
parent14952c72a29ec92badb1bcf16d2a15fe100f060d
parent7bad4b48c82fed4263c2bfe97a4d00b47913604a
Merge branch 'master' of ssh://jht@git.samba.org/data/git/samba