Merge some offline changes.
authorJelmer Vernooij <jelmer@samba.org>
Sat, 17 Feb 2007 15:46:52 +0000 (16:46 +0100)
committerJelmer Vernooij <jelmer@samba.org>
Sat, 17 Feb 2007 15:46:52 +0000 (16:46 +0100)

Trivial merge