Merge branch 'v3-2-test' of ssh://jra@git.samba.org/data/git/samba into v3-2-test
authorJeremy Allison <jra@samba.org>
Fri, 14 Dec 2007 00:46:42 +0000 (16:46 -0800)
committerJeremy Allison <jra@samba.org>
Fri, 14 Dec 2007 00:46:42 +0000 (16:46 -0800)
commitc9496e97cf91c5f29f19c123377f03f44d1a32f6
tree704ed3673b78b518cc02d4eee7539b5f55d64b2d
parent6b1246c29a0241c8e4bb98d659d847d010826b36
parentda23684261f40c06dea30ab2df0c878ebb0d0d81
Merge branch 'v3-2-test' of ssh://jra@git.samba.org/data/git/samba into v3-2-test