Merge branch 'v4-0-local' of git://git.id10ts.net/samba into 4-0-local
authorAndrew Bartlett <abartlet@samba.org>
Sat, 29 Mar 2008 06:19:20 +0000 (17:19 +1100)
committerAndrew Bartlett <abartlet@samba.org>
Sat, 29 Mar 2008 06:19:20 +0000 (17:19 +1100)
commite4d73e78a67a12b17fcbd6c78ecba904bf495f31
tree866a9428a9a698e4cb2cbdfc1177e96c3d9e4f3a
parent238a1a52f1fd3cce0a0fd980c1717c8540a1c7a1
parentba4739547ef9bf2eb4aac45be9d71264a845e4fc
Merge branch 'v4-0-local' of git://git.id10ts.net/samba into 4-0-local
(This used to be commit ee6539e4cab8882faafff17f458df91cba352f8e)