merge of '1889b23e60bd0651ca48e0e38b914ffedce70bd2'
authorRod Whitby <rod@whitby.id.au>
Sat, 24 Mar 2007 09:52:55 +0000 (09:52 +0000)
committerRod Whitby <rod@whitby.id.au>
Sat, 24 Mar 2007 09:52:55 +0000 (09:52 +0000)
     and '5df32e0915ba204f944bb2bfc083f0cb605f466f'


Trivial merge