merge of '901930fb1bf09993b1a144bb4ae2c11a1ab98e91'
authorRod Whitby <rod@whitby.id.au>
Sat, 7 Apr 2007 21:28:58 +0000 (21:28 +0000)
committerRod Whitby <rod@whitby.id.au>
Sat, 7 Apr 2007 21:28:58 +0000 (21:28 +0000)
     and 'ee70175ed0a22d4d4bf77de0cc63ee155b413834'


Trivial merge