merge of 'b4e2c715e288ee539982fb926cb04f251d14ddcb'
authorRod Whitby <rod@whitby.id.au>
Wed, 14 Feb 2007 09:21:54 +0000 (09:21 +0000)
committerRod Whitby <rod@whitby.id.au>
Wed, 14 Feb 2007 09:21:54 +0000 (09:21 +0000)
     and 'c3e49db4e23d7e4c30cca6944348c6c969afed7e'


Trivial merge