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)
commit40a90e6a5581f74b2e8caf67d934a08e8a9befc9
treea34823fd0dec12eb87976e20e4dbdb3f3e4e1069
parent58b1ab92a117cfcb311bdcb41fe563077ad39500
parent98e72f574a9ce2a676bcb010e4e6ee2df39af4b6
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-pyirpc
(This used to be commit e1af9708c9b40edfa21862028672882797218174)