Merge branch 'v3-2-test' of git://git.samba.org/samba into v3-2-test
authorSteve French <smfrench@gmail.com>
Sat, 5 Jan 2008 20:51:23 +0000 (14:51 -0600)
committerSteve French <smfrench@gmail.com>
Sat, 5 Jan 2008 20:51:23 +0000 (14:51 -0600)
commitd3b91e494c824a65506ba1bc1cba5bba77000530
treeab99e0f2c9bf2f066cf90fcad0fb14d21c4d6af3
parentb9d2da4d10e6e7ac2dc604565c7f2ce39d0916b5
parent3e3205309b75edf7d29633525adfdceb5f8856eb
Merge branch 'v3-2-test' of git://git.samba.org/samba into v3-2-test