Merge branch 'v3-devel' of ssh://git.samba.org/data/git/samba into v3-devel
authorJelmer Vernooij <jelmer@samba.org>
Tue, 9 Sep 2008 17:27:00 +0000 (19:27 +0200)
committerJelmer Vernooij <jelmer@samba.org>
Tue, 9 Sep 2008 17:27:00 +0000 (19:27 +0200)
(This used to be commit c3d1b0097590566417bda3fa33a64e994c9c7526)


Trivial merge