Merge branch 'master' of ssh://git.samba.org/data/git/samba
authorAndrew Tridgell <tridge@samba.org>
Tue, 30 Sep 2008 20:02:09 +0000 (13:02 -0700)
committerAndrew Tridgell <tridge@samba.org>
Tue, 30 Sep 2008 20:02:09 +0000 (13:02 -0700)
commitf84093df863eb00238a6be1caba59d926f18e7a5
treef72c5aa9bfae972a5a376767a271eac5d5ded085
parentef6fc37add1fd9164eb143c953fde0d5a9fc584a
parent687ce0b60a3913b0f2eca2365a5ab56e78523ab5
Merge branch 'master' of ssh://git.samba.org/data/git/samba