Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-test
authorAndrew Tridgell <tridge@samba.org>
Thu, 24 Jul 2008 04:26:30 +0000 (14:26 +1000)
committerAndrew Tridgell <tridge@samba.org>
Thu, 24 Jul 2008 04:26:30 +0000 (14:26 +1000)
commit66f09a7fd121cf7857b45dabc4fcaf32ae543552
treef3dceee89ab41e1a3dc78849c9b57839000c77d3
parent2ecda9fde4aa00aecd6df6ebeb162d173853d146
parent05583308fe8278f1bc0c815e23cf5e470a81e12f
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-test
(This used to be commit 24309dbf4d9622fcfafa29ef98bc0459fdaa814b)