Merge branch 'master' of ssh://git.samba.org/data/git/samba
authorAndrew Tridgell <tridge@samba.org>
Sat, 4 Oct 2008 20:56:20 +0000 (13:56 -0700)
committerAndrew Tridgell <tridge@samba.org>
Sat, 4 Oct 2008 20:56:20 +0000 (13:56 -0700)
commite44369989c54e908e3481fb76444df6bcf4e228b
treed03f0f366118977a272f099588d91b3985e0281c
parentba5ef49f831dbbfec1a360cd4644999de822e2bc
parent80665a0b5abbdd8df735e1ccdab3206399beba0b
Merge branch 'master' of ssh://git.samba.org/data/git/samba