Merge branch 'v3-devel' of ssh://jra@git.samba.org/data/git/samba into v3-devel
authorJeremy Allison <jra@samba.org>
Thu, 4 Sep 2008 18:51:55 +0000 (11:51 -0700)
committerJeremy Allison <jra@samba.org>
Thu, 4 Sep 2008 18:51:55 +0000 (11:51 -0700)
commit7c16514eb9f36ee00e1846e6ae9f99fec06e5630
tree7db08c72fa7627ee395b6d662dda026f5c4313f1
parent304554115a2f2dc316386a9ea5bec237d67f595f
parent862ff66da912e840860452ef0846793961f3bb82
Merge branch 'v3-devel' of ssh://jra@git.samba.org/data/git/samba into v3-devel
(This used to be commit 98b2fbef5273b055242e24490736b0c9677b1732)