Merge replay branch.
authorJelmer Vernooij <jelmer@samba.org>
Sun, 11 Nov 2007 17:44:48 +0000 (18:44 +0100)
committerJelmer Vernooij <jelmer@samba.org>
Sun, 11 Nov 2007 17:44:48 +0000 (18:44 +0100)

Trivial merge