merge of '18ed2772b803c74be19752144c8ae81a577c9f06'
authorRod Whitby <rod@whitby.id.au>
Sat, 2 Jun 2007 16:47:40 +0000 (16:47 +0000)
committerRod Whitby <rod@whitby.id.au>
Sat, 2 Jun 2007 16:47:40 +0000 (16:47 +0000)
     and '337a5b25ca63db8c280a6eb478dba96f7fb3b342'


Trivial merge