Merge
authorack@localhost.localdomain <ack@localhost.localdomain>
Thu, 29 Jun 2006 13:49:41 +0000 (14:49 +0100)
committerack@localhost.localdomain <ack@localhost.localdomain>
Thu, 29 Jun 2006 13:49:41 +0000 (14:49 +0100)

Trivial merge