Merge branch 'v3-2-test' of git://git.samba.org/samba into v3-2-test
authorDerrell Lipman <derrell.lipman@unwireduniverse.com>
Wed, 16 Jan 2008 02:30:21 +0000 (02:30 +0000)
committerDerrell Lipman <derrell.lipman@unwireduniverse.com>
Wed, 16 Jan 2008 02:30:21 +0000 (02:30 +0000)
commit4ff2101c69a0cfcfdc5f775493cb6e88c57e4bbe
tree43763a20ae472888b0309c00900787ea01a5934b
parentf963d57096184dd9381fcc5f175150d27460ea7a
parent874425c8f680fb2f737b46a3177b239e69302af5
Merge branch 'v3-2-test' of git://git.samba.org/samba into v3-2-test