]> git.ipfire.org Git - thirdparty/samba.git/commitdiff
Merge branch 'v3-0-test' of git://git.samba.org/samba into v3-0-test
authorGerald (Jerry) Carter <jerry@samba.org>
Wed, 31 Oct 2007 02:22:43 +0000 (22:22 -0400)
committerGerald (Jerry) Carter <jerry@samba.org>
Wed, 31 Oct 2007 02:22:43 +0000 (22:22 -0400)

Trivial merge