Merge branch 'master' of ssh://git.samba.org/data/git/samba
authorJelmer Vernooij <jelmer@samba.org>
Tue, 25 Nov 2008 14:42:47 +0000 (15:42 +0100)
committerJelmer Vernooij <jelmer@samba.org>
Tue, 25 Nov 2008 14:42:47 +0000 (15:42 +0100)
commitfc0985dbc546eff9d9d8660a30a0bf923782f2d7
treee6130f181d66973d327ae314287be310261b49b5
parentf5a87e35d252934cf1c5bc27f4e3290520345d47
parent948218643a04e8bf28de5c716cb9e4115d8b2aa0
Merge branch 'master' of ssh://git.samba.org/data/git/samba