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)
commit5fb80987ddf0f8af6cd479964f1c5bb8340c7ba8
tree6774d8d7c9fb2ec1b6f4b5913636f5e36af1dae2
parentf9d99e63272520c19bddc9e4b47731d57e5658e2
parentf5f45d38269842b591a89ccaf2e6af7879d57aab
Merge.