Merge branch 'master' of ssh://git.samba.org/data/git/samba into xmaster
authorJelmer Vernooij <jelmer@samba.org>
Sat, 18 Oct 2008 13:37:57 +0000 (15:37 +0200)
committerJelmer Vernooij <jelmer@samba.org>
Sat, 18 Oct 2008 13:37:57 +0000 (15:37 +0200)
commit6c83039eaba70fe983325f15359f1bafc40c4ec6
tree84f0766be1c9fc1f6f284cb38ad693fb59a20eae
parent18faf30d1684ed9d46ffa42b6d6f9768c2b0c54f
parent339925f98d5b42f7ea09842f3920fb9281e6caa2
Merge branch 'master' of ssh://git.samba.org/data/git/samba into xmaster