Merge branch 'master' of ssh://git.samba.org/data/git/samba
authorJelmer Vernooij <jelmer@samba.org>
Mon, 27 Oct 2008 22:41:48 +0000 (23:41 +0100)
committerJelmer Vernooij <jelmer@samba.org>
Mon, 27 Oct 2008 22:41:48 +0000 (23:41 +0100)
commit35f12009af7e70c7bf45f751bdbd12f8146a7c0b
tree5ddf16c4690218e158889d3b26b8258931a48b3a
parentaafe9ca1aa829f64d4bad1df3ee1d5997fb17d71
parenta4ad2658500e83613eeb5c01a6dfb5d067803d16
Merge branch 'master' of ssh://git.samba.org/data/git/samba