merge of '006d6113a94568f91a2927f810dc644c5b7adc06'
authorRod Whitby <rod@whitby.id.au>
Fri, 27 Apr 2007 23:18:20 +0000 (23:18 +0000)
committerRod Whitby <rod@whitby.id.au>
Fri, 27 Apr 2007 23:18:20 +0000 (23:18 +0000)
     and 'f8b383b38cf0d8df1ccc5bccd2a776bc1bca1ae9'


Trivial merge