Merge branch 'v3-2-test' of ssh://git.samba.org/data/git/samba into v3-2-simo
authorSimo Sorce <idra@samba.org>
Mon, 17 Dec 2007 20:26:16 +0000 (15:26 -0500)
committerSimo Sorce <idra@samba.org>
Mon, 17 Dec 2007 20:26:16 +0000 (15:26 -0500)
(This used to be commit e940537d5be870ae622712a3b76dff891739df8c)


Trivial merge