merge of c598e249842cbe91970bb34d033cec3f7506d983
authorRod Whitby <rod@whitby.id.au>
Tue, 2 Jan 2007 01:18:03 +0000 (01:18 +0000)
committerRod Whitby <rod@whitby.id.au>
Tue, 2 Jan 2007 01:18:03 +0000 (01:18 +0000)
     and dc166a634d98eed0d4db914b9baa853e0041ee57


Trivial merge