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 14:41:43 +0000 (14:41 +0000)
committerDerrell Lipman <derrell.lipman@unwireduniverse.com>
Wed, 16 Jan 2008 14:41:43 +0000 (14:41 +0000)
commitaebecd7462733b56457540423354ba249fd52808
tree29a3f528d016a8713bf47c7101f759a88409a9fb
parent9d75ea577b407ccab59196760d376831062a3ab5
parent4db26c803de52d3efccc940efc55f14131a057f5
Merge branch 'v3-2-test' of git://git.samba.org/samba into v3-2-test