Merge branch 'master' of ssh://git.samba.org/data/git/samba
authorAndrew Tridgell <tridge@samba.org>
Wed, 7 Oct 2009 05:21:28 +0000 (16:21 +1100)
committerAndrew Tridgell <tridge@samba.org>
Wed, 7 Oct 2009 05:21:28 +0000 (16:21 +1100)
commitd29409c1523b9d7ca9b3a7400bd9c94641decc46
tree239ffbfe62c7a5dabe46a7aa5f449923e817a7e9
parentb3377ef2ea71489749787ba13fba4dba1e9b6c6c
parent26b77348414fc99ec0a07cb5376942d722ddf643
Merge branch 'master' of ssh://git.samba.org/data/git/samba