Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-abartlet
authorAndrew Bartlett <abartlet@samba.org>
Wed, 10 Sep 2008 04:09:07 +0000 (14:09 +1000)
committerAndrew Bartlett <abartlet@samba.org>
Wed, 10 Sep 2008 04:09:07 +0000 (14:09 +1000)
commited26195d0eda6dd1ca14508cfd31a48dde79d44f
tree463337c801d8a3510d5d36f98b46bf3ae114e5d2
parent2209787812fd9224d104f332e25d8ce64ef9ee95
parent6ad94d10f79f206fcdeb23cf71595e38c7a77855
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-abartlet