merge of f1aec3973fabc9c4f6c9f30f9428420022ef0d2f
authorRod Whitby <rod@whitby.id.au>
Sun, 17 Dec 2006 17:02:47 +0000 (17:02 +0000)
committerRod Whitby <rod@whitby.id.au>
Sun, 17 Dec 2006 17:02:47 +0000 (17:02 +0000)
     and f59136c4b28aaa19b16da93cb6a02370f346853e


Trivial merge