merge
authorkfraser@localhost.localdomain <kfraser@localhost.localdomain>
Mon, 8 Jan 2007 14:26:57 +0000 (14:26 +0000)
committerkfraser@localhost.localdomain <kfraser@localhost.localdomain>
Mon, 8 Jan 2007 14:26:57 +0000 (14:26 +0000)

Trivial merge