merge from peter
authorAndrew Tridgell <tridge@samba.org>
Sat, 16 Dec 2006 00:21:24 +0000 (11:21 +1100)
committerAndrew Tridgell <tridge@samba.org>
Sat, 16 Dec 2006 00:21:24 +0000 (11:21 +1100)
commitc690d4bbc4b6279d7fdce28b017566ea9bd65ef5
tree58ceb11e25516b8ea7ca76ebfc9a78df948e2b69
parentc432f377b6e71183309d32256a834683801045f8
parent0fecfdea111f2f5d25eadce04c5f35dffca29b26
merge from peter