Merge some offline changes.
authorJelmer Vernooij <jelmer@samba.org>
Mon, 1 Oct 2007 18:18:33 +0000 (20:18 +0200)
committerJelmer Vernooij <jelmer@samba.org>
Mon, 1 Oct 2007 18:18:33 +0000 (20:18 +0200)
commitdf576a9789d06f9e61e3a58e8a9156d87f9261db
tree4ef7b304439edd7b11f38c99aa26d23c5429da6a
parent2ee0221eaf95890d4a23422d6fb43602cd24768f
parent75c553f589b83fa531fb934dc1bdfb20fd5ad000
Merge some offline changes.