Merge branch 'v4-0-local' of git://git.id10ts.net/samba into 4-0-local
authorAndrew Bartlett <abartlet@samba.org>
Fri, 28 Mar 2008 02:39:59 +0000 (13:39 +1100)
committerAndrew Bartlett <abartlet@samba.org>
Fri, 28 Mar 2008 02:39:59 +0000 (13:39 +1100)
commit7d1e922a6879110b7953de7560cc4b51ff36ea10
treeff79f5d8470bfe38b6773bd49c83dc131178b576
parentfbcaa622bd1929399e32326349e96b6676a49b96
parent68f0b4f929748dad3641fd84ee9eea0b109f898b
Merge branch 'v4-0-local' of git://git.id10ts.net/samba into 4-0-local