Merge branch 'v3-2-test' of ssh://git.samba.org/data/git/samba into 3-2-nopipeindex
authorJelmer Vernooij <jelmer@samba.org>
Tue, 15 Apr 2008 18:52:17 +0000 (20:52 +0200)
committerJelmer Vernooij <jelmer@samba.org>
Tue, 15 Apr 2008 18:52:17 +0000 (20:52 +0200)
(This used to be commit 9028f9e065536594df901ae4aac900102f2d85f6)


Trivial merge