merge of 5c1ed62467a4b699ec7940179d22e83acf36ad4f
authorRod Whitby <rod@whitby.id.au>
Mon, 1 Jan 2007 18:17:27 +0000 (18:17 +0000)
committerRod Whitby <rod@whitby.id.au>
Mon, 1 Jan 2007 18:17:27 +0000 (18:17 +0000)
     and df8798fa87151d8069ac3ca7b3a4dc6108eb4ac5


Trivial merge