merge of 206882f2137f73ff7b526c9a93ca7485bfedfc4a
authorRod Whitby <rod@whitby.id.au>
Sun, 27 Aug 2006 10:01:16 +0000 (10:01 +0000)
committerRod Whitby <rod@whitby.id.au>
Sun, 27 Aug 2006 10:01:16 +0000 (10:01 +0000)
     and 5b5482ad5b6769c00f9796072b56eec22e850d26


Trivial merge