merge of 399a28c52fc147b1a3218c47622126f864b2e129
authorRod Whitby <rod@whitby.id.au>
Tue, 2 Jan 2007 01:17:58 +0000 (01:17 +0000)
committerRod Whitby <rod@whitby.id.au>
Tue, 2 Jan 2007 01:17:58 +0000 (01:17 +0000)
     and bcaae16b49f72fbc56e2ec7aa8633d3f55b36d2f


Trivial merge