Merge branch 'master' of ssh://git.samba.org/data/git/samba
authorAndrew Tridgell <tridge@samba.org>
Thu, 26 Mar 2009 22:32:43 +0000 (09:32 +1100)
committerAndrew Tridgell <tridge@samba.org>
Thu, 26 Mar 2009 22:32:43 +0000 (09:32 +1100)
commit049534336c8df538ab3c384c0f505cf3bc6a1300
treeec85d0e9c539d07a1df44412aa4b26e8b98ccaba
parentd88ced1dccd8f6eb6a1931d3ccae2c7cb0667020
parente235b4628b473f30275a534f5172c8926d3f205d
Merge branch 'master' of ssh://git.samba.org/data/git/samba