merge from ronnie
authorAndrew Tridgell <tridge@samba.org>
Wed, 16 Jan 2008 03:32:29 +0000 (14:32 +1100)
committerAndrew Tridgell <tridge@samba.org>
Wed, 16 Jan 2008 03:32:29 +0000 (14:32 +1100)
commitc0173a5fb9010474064209f2153797b57ff7e2a2
treeac09aa16f2fe39d87f9e765e865e8f0e39aee52f
parentb607ceff4e7337b0671ff1e295b418d55f01d025
parent968866699604bae8cdf43478ad2b2cb1c4df6dbc
merge from ronnie