Merge branch 'master' of ssh://git.samba.org/data/git/samba
authorJelmer Vernooij <jelmer@samba.org>
Thu, 23 Oct 2008 18:42:30 +0000 (20:42 +0200)
committerJelmer Vernooij <jelmer@samba.org>
Thu, 23 Oct 2008 18:42:30 +0000 (20:42 +0200)
commit7577d9ebf06fcdb630b2cdaab8772a6da9e37b70
tree8279953b1d7f24647ef8bb728881938f6f875400
parentfe36fe8c3e76e3dd7c66ecdf7254dc01c5d065c0
parent27c4cf4e7b2ba042b4caace7bab19f9e37510d86
Merge branch 'master' of ssh://git.samba.org/data/git/samba