Merge branch 'v3-devel' of ssh://jra@git.samba.org/data/git/samba into v3-devel
authorJeremy Allison <jra@samba.org>
Fri, 29 Aug 2008 16:29:21 +0000 (09:29 -0700)
committerJeremy Allison <jra@samba.org>
Fri, 29 Aug 2008 16:29:21 +0000 (09:29 -0700)
commit8f525afbd2f2a849086c60ee890218a070cecd34
treeb4398adfa7e57dacf7f7d9b29b4a14f6596d6fe0
parentb12c7dbb53023d1ea9e7df20137c0ad6ba21b9f0
parentd2dc2e34be6f13956a91678bcb8dd098fb0e5c8b
Merge branch 'v3-devel' of ssh://jra@git.samba.org/data/git/samba into v3-devel
(This used to be commit 882297edc024c146f24fc9f847d2b0b813f93fc7)