merge of '035b9c0d47e7de1217dae47339a609d9285d14bb'
authorRod Whitby <rod@whitby.id.au>
Thu, 12 Apr 2007 10:09:11 +0000 (10:09 +0000)
committerRod Whitby <rod@whitby.id.au>
Thu, 12 Apr 2007 10:09:11 +0000 (10:09 +0000)
     and '9518b4f4eabaf4a22b686fd2ade256eee6952b47'


Trivial merge