Merge branch 'v3-2-test' of ssh://git.samba.org/data/git/samba into v3-2-test
authorAndrew Tridgell <tridge@samba.org>
Wed, 23 Jan 2008 02:08:14 +0000 (13:08 +1100)
committerAndrew Tridgell <tridge@samba.org>
Wed, 23 Jan 2008 02:08:14 +0000 (13:08 +1100)

Trivial merge