merge of 38257702404c262d564d18a82a4c034de93cbe95
authorRod Whitby <rod@whitby.id.au>
Sun, 10 Dec 2006 20:32:05 +0000 (20:32 +0000)
committerRod Whitby <rod@whitby.id.au>
Sun, 10 Dec 2006 20:32:05 +0000 (20:32 +0000)
     and f364e3e809950cf1c1059b61206516bd02506cf9


Trivial merge