merge of '017fd59a29d14dbd3c9a86e2bccaadc64909892a'
authorRod Whitby <rod@whitby.id.au>
Sun, 27 Apr 2008 13:28:41 +0000 (13:28 +0000)
committerRod Whitby <rod@whitby.id.au>
Sun, 27 Apr 2008 13:28:41 +0000 (13:28 +0000)
     and 'efd9ac5db96b1872b9947299a1e10d54a34a86a3'


Trivial merge