Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-pyirpc
authorJelmer Vernooij <jelmer@samba.org>
Sun, 25 May 2008 04:38:05 +0000 (06:38 +0200)
committerJelmer Vernooij <jelmer@samba.org>
Sun, 25 May 2008 04:38:05 +0000 (06:38 +0200)
(This used to be commit 0a9330ee2a38bff13bf9af48114e6eecd962680b)


Trivial merge