]> git.ipfire.org Git - thirdparty/samba.git/commitdiff
merge from Peter
authorAndrew Tridgell <tridge@samba.org>
Tue, 19 Dec 2006 23:35:27 +0000 (10:35 +1100)
committerAndrew Tridgell <tridge@samba.org>
Tue, 19 Dec 2006 23:35:27 +0000 (10:35 +1100)
(This used to be ctdb commit 19bbfc7eeaccb795782647c743690cf5c131796d)


Trivial merge