Merge branch 'wbinfo-test' of git://git.samba.org/kai/samba/kai-work-in-progress...
authorJelmer Vernooij <jelmer@samba.org>
Tue, 15 Apr 2008 22:05:36 +0000 (00:05 +0200)
committerJelmer Vernooij <jelmer@samba.org>
Tue, 15 Apr 2008 22:05:36 +0000 (00:05 +0200)
(This used to be commit 56340a5fa1b075001bba829686861a59406e1f5d)


Trivial merge