merge of '8ae04a59083ddef3523a8a711e1226189fac6419'
authorRod Whitby <rod@whitby.id.au>
Thu, 12 Apr 2007 22:46:53 +0000 (22:46 +0000)
committerRod Whitby <rod@whitby.id.au>
Thu, 12 Apr 2007 22:46:53 +0000 (22:46 +0000)
     and 'e09a09e07f8744e8484e7b3351be29f7775bb030'


Trivial merge