merge of '966130b6b30869c9981de21ad3a1f77b37e92adf'
authorRod Whitby <rod@whitby.id.au>
Thu, 22 Mar 2007 20:38:40 +0000 (20:38 +0000)
committerRod Whitby <rod@whitby.id.au>
Thu, 22 Mar 2007 20:38:40 +0000 (20:38 +0000)
     and 'be71d5d419cf2691925b6df8c960264a219ea468'


Trivial merge