Merge branch 'master' of git://git.samba.org/samba
authorJelmer Vernooij <jelmer@samba.org>
Fri, 31 Oct 2008 01:49:43 +0000 (02:49 +0100)
committerJelmer Vernooij <jelmer@samba.org>
Fri, 31 Oct 2008 01:49:43 +0000 (02:49 +0100)
commitf6c3710d4127c7c2ab63578117048c2a18ee2d64
tree4b4f62b139a8e38aeec6fd03ff65b38a2e9017ba
parent9bcd5720cffe77a7095195af9932e755507a91c4
parent569fda3173219384ee3cfd30cbc49d5bee1138c6
Merge branch 'master' of git://git.samba.org/samba