Merge branch 'master' of ssh://git.samba.org/data/git/samba
authorJelmer Vernooij <jelmer@samba.org>
Fri, 16 Jan 2009 14:51:46 +0000 (15:51 +0100)
committerJelmer Vernooij <jelmer@samba.org>
Fri, 16 Jan 2009 14:51:46 +0000 (15:51 +0100)
commit0bb7ccd0b0d245f87aaab71f3deaee49df9c27c7
tree9d144da5fa6999e1ec5675164fb386581071e807
parentf69ac1398770e4c8c211e083bcf526f9a9d99e4a
parentdc6edf1ab4ae8e3fb3ef40b93135ff0ef5407e12
Merge branch 'master' of ssh://git.samba.org/data/git/samba