merge of 'bc89338ca2101af77f442deb20adcbb628e64e65'
authorRod Whitby <rod@whitby.id.au>
Sat, 17 Mar 2007 15:28:44 +0000 (15:28 +0000)
committerRod Whitby <rod@whitby.id.au>
Sat, 17 Mar 2007 15:28:44 +0000 (15:28 +0000)
     and 'da190699aa6161c0dab5185e2c86e14537953f1b'


Trivial merge