Merge branch 'master' of ssh://git.samba.org/data/git/samba
authorJelmer Vernooij <jelmer@samba.org>
Sat, 20 Dec 2008 20:21:19 +0000 (21:21 +0100)
committerJelmer Vernooij <jelmer@samba.org>
Sat, 20 Dec 2008 20:21:19 +0000 (21:21 +0100)
commit5688f9b13e2e58b7ed945301390188c2b40c4d60
tree118fd01a0a90ccd77a9b9130578123f830e99c8c
parent759a3bcc88230c5232b748bb8f5a0c6e0cce128c
parentec80992ef5b54c443e41ebb91e793384907e68ba
Merge branch 'master' of ssh://git.samba.org/data/git/samba