Merge branch 'v3-devel' of ssh://jra@git.samba.org/data/git/samba into v3-devel
authorJeremy Allison <jra@samba.org>
Wed, 10 Sep 2008 21:57:52 +0000 (14:57 -0700)
committerJeremy Allison <jra@samba.org>
Wed, 10 Sep 2008 21:57:52 +0000 (14:57 -0700)
(This used to be commit a03b0dde01e4cebe07a65af3943d178dbdeda276)


Trivial merge