merge
authorkfraser@localhost.localdomain <kfraser@localhost.localdomain>
Fri, 12 Jan 2007 15:19:23 +0000 (15:19 +0000)
committerkfraser@localhost.localdomain <kfraser@localhost.localdomain>
Fri, 12 Jan 2007 15:19:23 +0000 (15:19 +0000)

Trivial merge