Merge branch 'master' of ssh://git.samba.org/data/git/samba
authorAndrew Tridgell <tridge@samba.org>
Mon, 12 Oct 2009 23:03:57 +0000 (10:03 +1100)
committerAndrew Tridgell <tridge@samba.org>
Mon, 12 Oct 2009 23:03:57 +0000 (10:03 +1100)
commitae507f620ae34b69c5df86980ea6e374c9c1e548
treec2669a72121c02ecc2d1e4aee16a3129960a5c66
parentdfbaf79a1b7455a0eef61813e07cb661cf17e995
parent4a1b50afd567313cc25d5bbc14e01e170aa62a00
Merge branch 'master' of ssh://git.samba.org/data/git/samba