merge of '24d82a2b5a32fe5d1e0f3aa0049aaa50eb5ba7bc'
authorRod Whitby <rod@whitby.id.au>
Tue, 6 Feb 2007 09:43:37 +0000 (09:43 +0000)
committerRod Whitby <rod@whitby.id.au>
Tue, 6 Feb 2007 09:43:37 +0000 (09:43 +0000)
     and '2c6de6579f49b4666352be054c76acd300924753'


Trivial merge