Merge commit 'samba/v3-2-test' into v3-2-stable
authorGerald (Jerry) Carter <jerry@samba.org>
Tue, 15 Jan 2008 13:59:23 +0000 (07:59 -0600)
committerGerald (Jerry) Carter <jerry@samba.org>
Tue, 15 Jan 2008 13:59:23 +0000 (07:59 -0600)
commit7ff128ef03ed03e6b9ce17642cda793255f17c0e
treea6b2202fffd22ebb24546998f4c3c0efd7fecac1
parentf0edf72d87ca300058c3ae7f464f26b9a2cce651
parentab10557a68aae9d8065966129dee751e69880ad1
Merge commit 'samba/v3-2-test' into v3-2-stable
(This used to be commit 061c90fefef0e6093dfc3912d381cc306549ed4b)