merge of 'a2feb55d5703de5d580f9a019866a69764257a81'
authorRod Whitby <rod@whitby.id.au>
Wed, 21 Mar 2007 11:48:05 +0000 (11:48 +0000)
committerRod Whitby <rod@whitby.id.au>
Wed, 21 Mar 2007 11:48:05 +0000 (11:48 +0000)
     and 'db071bb70415ead50405da898a88810665727336'


Trivial merge