merge of '865584df04f1440b583bd3cd32b7c9fda959998b'
authorRod Whitby <rod@whitby.id.au>
Tue, 6 Feb 2007 10:23:52 +0000 (10:23 +0000)
committerRod Whitby <rod@whitby.id.au>
Tue, 6 Feb 2007 10:23:52 +0000 (10:23 +0000)
     and 'fda96508efa311cef118693c03ac023a13f325ca'


Trivial merge