Merge branch 'master' of ssh://git.samba.org/data/git/samba
authorJelmer Vernooij <jelmer@samba.org>
Tue, 23 Dec 2008 21:12:23 +0000 (22:12 +0100)
committerJelmer Vernooij <jelmer@samba.org>
Tue, 23 Dec 2008 21:12:23 +0000 (22:12 +0100)
commit5c75b65ca15f7c71babd835a45b252fed6534acf
tree6b8baa3f5d27c4eafd89fece7deedae30a6ff1fd
parent86cee0b28c50dd849fe919bbe3faa4deba5275bf
parentff26cb4b1c1d0292231e1cfc0490f4be6040d3e3
Merge branch 'master' of ssh://git.samba.org/data/git/samba