merge from peter
authorAndrew Tridgell <tridge@samba.org>
Thu, 26 Apr 2007 15:13:58 +0000 (17:13 +0200)
committerAndrew Tridgell <tridge@samba.org>
Thu, 26 Apr 2007 15:13:58 +0000 (17:13 +0200)
commite340d8d2af90d9a2819b0029f048cf4727617e7a
tree50e3800eb4a8941418632675219eb9f1891e429c
parentb921dc2c7932e0c1ece6ac3f57e117d0500f8214
parent9a810d1f3201ec559d1f4f20ef4a42d7aa7090c4
merge from peter