Merge branch 'v3-2-test' of git://git.samba.org/samba into v3-2-test
authorGerald (Jerry) Carter <jerry@samba.org>
Fri, 2 Nov 2007 18:16:40 +0000 (14:16 -0400)
committerGerald (Jerry) Carter <jerry@samba.org>
Fri, 2 Nov 2007 18:16:40 +0000 (14:16 -0400)
commit95de80218c10a72c7b28541c3c2e475e083b68f1
tree1441e0f05aef5a5782aef2bcd707ae439d4b69f6
parent10af752391be51c7381a4eaca27f29e1f2a677b3
parentc3de44b6b063e126095b30536fdcb643c70e395e
Merge branch 'v3-2-test' of git://git.samba.org/samba into v3-2-test