merge of 03a7d68c3436f6a990749305cdd36942d734f471
authorRod Whitby <rod@whitby.id.au>
Thu, 7 Sep 2006 12:46:21 +0000 (12:46 +0000)
committerRod Whitby <rod@whitby.id.au>
Thu, 7 Sep 2006 12:46:21 +0000 (12:46 +0000)
     and 97aa85608cddac7f5307ba3e1f9c299b20bbf014


Trivial merge