Merge branch 'v3-2-test' of ssh://git.samba.org/data/git/samba into v3-2-test
authorDerrell Lipman <derrell.lipman@unwireduniverse.com>
Thu, 17 Jan 2008 14:29:52 +0000 (09:29 -0500)
committerDerrell Lipman <derrell.lipman@unwireduniverse.com>
Thu, 17 Jan 2008 14:29:52 +0000 (09:29 -0500)
commit15ef5e4884505bca7990e44200d0235764e9057f
tree261ff6d48323f20784ea7de52c34f3675829a7a7
parentb4282fbd6d27d868b2d5c04bb72d2d7421822da1
parente342ca0d931f9a5c8ec9e472dc9c63f1fe012b3a
Merge branch 'v3-2-test' of ssh://git.samba.org/data/git/samba into v3-2-test