merge of '07233f180651ad683d48bb717b7040c7944779a7'
authorRod Whitby <rod@whitby.id.au>
Fri, 27 Apr 2007 10:57:39 +0000 (10:57 +0000)
committerRod Whitby <rod@whitby.id.au>
Fri, 27 Apr 2007 10:57:39 +0000 (10:57 +0000)
     and 'cb6f5bda5ad48f24d6f8b52489fec941ec043d95'


Trivial merge