merge of '82fb03e3d78d465b8f7903451af35bcae014501c'
authorRod Whitby <rod@whitby.id.au>
Wed, 11 Apr 2007 07:11:36 +0000 (07:11 +0000)
committerRod Whitby <rod@whitby.id.au>
Wed, 11 Apr 2007 07:11:36 +0000 (07:11 +0000)
     and '895242856fcf260e6a8c8b8e33b96b1304232974'


Trivial merge