Merge branch 'master' of ssh://git.samba.org/data/git/samba
commitc5a70cab25de3b0acd89ba12150b9077bb59cbb5
authorJelmer Vernooij <jelmer@samba.org>
Sun, 2 Nov 2008 23:15:27 +0000 (3 00:15 +0100)
committerJelmer Vernooij <jelmer@samba.org>
Sun, 2 Nov 2008 23:15:27 +0000 (3 00:15 +0100)
treeda8887ad758b62641006185c64b7d46c6c650f68
parent1575cae7e53a5738d7e2530e855aef68ca971706
parent7808a2594c22ff452d54d2e9e272aa60e4b7e482
Merge branch 'master' of ssh://git.samba.org/data/git/samba