merge of '045b9bbf9c078611ba163403644caface6f217ee'
authorRod Whitby <rod@whitby.id.au>
Tue, 13 Feb 2007 22:23:58 +0000 (22:23 +0000)
committerRod Whitby <rod@whitby.id.au>
Tue, 13 Feb 2007 22:23:58 +0000 (22:23 +0000)
     and '50c9ee81517d5a1c32a7a7afe7a00793aabceb33'


Trivial merge