merge of 'eb047a6635d08630dddbc92ab294e878aaa9be5f'
authorRod Whitby <rod@whitby.id.au>
Sat, 2 Jun 2007 06:46:53 +0000 (06:46 +0000)
committerRod Whitby <rod@whitby.id.au>
Sat, 2 Jun 2007 06:46:53 +0000 (06:46 +0000)
     and 'eb4cd1c080a17fb433c19d31a7e5bc09462243a4'


Trivial merge