Merge commit 'samba/v3-2-test' into v3-2-stable
authorGerald (Jerry) Carter <jerry@samba.org>
Mon, 14 Jan 2008 15:49:47 +0000 (09:49 -0600)
committerGerald (Jerry) Carter <jerry@samba.org>
Mon, 14 Jan 2008 15:49:47 +0000 (09:49 -0600)
commit6811ea1ce2d46f7303b4edf661e27d2edf54724f
treed01c2d28e9f4177a55d4847d5109c830cfd797b6
parent22d2ff0bc4d1012cc3ffc7ab0fdbab5a8188a0cb
parent99dd28da84c270f46535bd2ffa6bfef96d2e2eed
Merge commit 'samba/v3-2-test' into v3-2-stable