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)
commitf426949e8861b3a97d321516edbcbd771b7d6273
tree0cd7a81fe0bd97d2d227280eda62fabbb185154e
parent6e94cbdc30afc3c9b5d2504aa8649fa9c87af7aa
parent7e2b8eb0797e7bf1f3c4e27fcbd775983080affc
Merge branch 'v3-2-test' of git://git.samba.org/samba into v3-2-test
(This used to be commit 4ff2101c69a0cfcfdc5f775493cb6e88c57e4bbe)