merge of 072c2a858cbd277f873317983dcf080743e42c08
authorRod Whitby <rod@whitby.id.au>
Sun, 10 Dec 2006 23:46:54 +0000 (23:46 +0000)
committerRod Whitby <rod@whitby.id.au>
Sun, 10 Dec 2006 23:46:54 +0000 (23:46 +0000)
     and 41db577c3c375bd1d331db987173c324ab65bb47


Trivial merge