merge of '6aeac16d88adfacea342067ea5b2bc44f9f19ddc'
authorRod Whitby <rod@whitby.id.au>
Fri, 9 Mar 2007 23:08:08 +0000 (23:08 +0000)
committerRod Whitby <rod@whitby.id.au>
Fri, 9 Mar 2007 23:08:08 +0000 (23:08 +0000)
     and 'b2d9cd46c2dfa6e43c84754934f6b089af67c1d8'


Trivial merge