Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-pyirpc
authorJelmer Vernooij <jelmer@samba.org>
Mon, 26 May 2008 10:19:09 +0000 (12:19 +0200)
committerJelmer Vernooij <jelmer@samba.org>
Mon, 26 May 2008 10:19:09 +0000 (12:19 +0200)
commite1af9708c9b40edfa21862028672882797218174
treefed7415edc28910a8979990092975804114f1337
parent17231443a0e3b0ebc4b75db3d721fe0b4e1170c6
parent8995c2f12174ebacc4a6b0864b6583665494a14b
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-pyirpc