Merge.
authorrjones@thinkpad <rjones@thinkpad>
Thu, 17 Apr 2008 10:13:39 +0000 (11:13 +0100)
committerrjones@thinkpad <rjones@thinkpad>
Thu, 17 Apr 2008 10:13:39 +0000 (11:13 +0100)

Trivial merge