Merge branch 'master' of git://git.samba.org/samba
authorJelmer Vernooij <jelmer@samba.org>
Thu, 23 Oct 2008 15:04:16 +0000 (17:04 +0200)
committerJelmer Vernooij <jelmer@samba.org>
Thu, 23 Oct 2008 15:04:16 +0000 (17:04 +0200)
commitd59f476ecdfff5553144bca9f60bec0d0645a930
treeb2c4e92c96c6aff016415e9a22f04f557ca31ebd
parent5b5e36085a2c10dda7dbd65b0dfb9cdbe6490f21
parentae1abe843a349d55eb8d606f79a7753804a82547
Merge branch 'master' of git://git.samba.org/samba