Merge branch 'master' of ssh://git.samba.org/data/git/samba
authorJelmer Vernooij <jelmer@samba.org>
Thu, 23 Oct 2008 16:50:34 +0000 (18:50 +0200)
committerJelmer Vernooij <jelmer@samba.org>
Thu, 23 Oct 2008 16:50:34 +0000 (18:50 +0200)
commitc17898db4e2e1ac342ce9dfb0991d58dbd6ea4af
treed3bc06f9a617091b0300af4e1f85527391a1d1d9
parent81fabeff2dc51c043da19cd095175c4951f527b6
parentf36ffa768129f01b0c12d30bff5e4e205dd3676c
Merge branch 'master' of ssh://git.samba.org/data/git/samba