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)
(This used to be commit 882297edc024c146f24fc9f847d2b0b813f93fc7)


Trivial merge