Merge commit 'samba/v3-2-test' into v3-2-stable
commit9a50c929ba0de8c0d1f7fc515cc6b3d954a6c9d7
authorGerald (Jerry) Carter <jerry@samba.org>
Mon, 14 Jan 2008 21:10:14 +0000 (14 15:10 -0600)
committerGerald (Jerry) Carter <jerry@samba.org>
Mon, 14 Jan 2008 21:10:14 +0000 (14 15:10 -0600)
treebfe689a52df86b727fe29cc59d8ef30b21ca8d3b
parent582bd8071f168190e0cf1f6d1637f79ebee287c3
parentedd4cb0373a668c422b3aa2a460c1004682f3d1d
Merge commit 'samba/v3-2-test' into v3-2-stable
(This used to be commit bb36b74a4e8fa63672031145b6d39d79468241d9)