Merge branch 'master' of ssh://git.samba.org/data/git/samba
authorJelmer Vernooij <jelmer@samba.org>
Thu, 23 Oct 2008 15:12:16 +0000 (17:12 +0200)
committerJelmer Vernooij <jelmer@samba.org>
Thu, 23 Oct 2008 15:12:16 +0000 (17:12 +0200)
commitdb65c3374ad337135a7bd4d67abced258c01c5bd
treea05d5939b8f20a8429f09169d7c8611d206f2b42
parent0e36ffc6750f77018a5201ea9503d53401dda642
parentd59f476ecdfff5553144bca9f60bec0d0645a930
Merge branch 'master' of ssh://git.samba.org/data/git/samba