Merge branch 'master' of ssh://git.samba.org/data/git/samba
commit5ecccac1c34f58019b195f6838f57366faa3575d
authorAndrew Tridgell <tridge@samba.org>
Fri, 31 Oct 2008 02:55:26 +0000 (31 13:55 +1100)
committerAndrew Tridgell <tridge@samba.org>
Fri, 31 Oct 2008 02:55:26 +0000 (31 13:55 +1100)
tree3475f5b34220e4735a1c74b24f3bddbbf76f90df
parent391264a1006c147d82c983701ae382005c251d75
parent6066e1a44d041d7a5cafcb4c0276f5ff323226d9
Merge branch 'master' of ssh://git.samba.org/data/git/samba