merge of '7b1b675acdab1f2f94fa198937d17e71465a6251'
authorRod Whitby <rod@whitby.id.au>
Fri, 13 Apr 2007 12:18:24 +0000 (12:18 +0000)
committerRod Whitby <rod@whitby.id.au>
Fri, 13 Apr 2007 12:18:24 +0000 (12:18 +0000)
     and 'ea2cdd5b56f48503576d815730d28e0a97f397bf'


Trivial merge