Merge branch 'master' of git://git.samba.org/samba
authorJelmer Vernooij <jelmer@samba.org>
Fri, 31 Oct 2008 01:40:28 +0000 (02:40 +0100)
committerJelmer Vernooij <jelmer@samba.org>
Fri, 31 Oct 2008 01:40:28 +0000 (02:40 +0100)
commit9bcd5720cffe77a7095195af9932e755507a91c4
tree443c434bed0168e29a182bbba4bd890097a03859
parent5c946b1b286e922db86e64d42ec5db985b9086d8
parent8c1a90c2e319270cb2cab7ed995a61a9902c884d
Merge branch 'master' of git://git.samba.org/samba