]> git.samba.org - abartlet/samba.git/.git/commitdiff
Merge branch 'v3-2-test' of ssh://jra@git.samba.org/data/git/samba into v3-2-test
authorJeremy Allison <jra@samba.org>
Tue, 15 Jan 2008 18:19:47 +0000 (10:19 -0800)
committerJeremy Allison <jra@samba.org>
Tue, 15 Jan 2008 18:19:47 +0000 (10:19 -0800)
(This used to be commit 6e17a56039be13ac1ef7004f15d154141bad7196)


Trivial merge