Merge branch 'master' of ssh://git.samba.org/data/git/samba
authorJelmer Vernooij <jelmer@samba.org>
Tue, 23 Dec 2008 22:26:32 +0000 (23:26 +0100)
committerJelmer Vernooij <jelmer@samba.org>
Tue, 23 Dec 2008 22:26:32 +0000 (23:26 +0100)
commit30bdb68c9ebe281d8c512f8b737141d76a7c7d68
tree2b693c26abf39030b8a81b67819896e8e1f3b00b
parente94e7f82798db59849cb1dc6a99b414adc11594e
parent5c75b65ca15f7c71babd835a45b252fed6534acf
Merge branch 'master' of ssh://git.samba.org/data/git/samba