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)

Trivial merge