merge of '2b0c6d15b30870f04728a138d2e30c4720e47fa6'
authorRod Whitby <rod@whitby.id.au>
Sun, 19 Aug 2007 01:04:47 +0000 (01:04 +0000)
committerRod Whitby <rod@whitby.id.au>
Sun, 19 Aug 2007 01:04:47 +0000 (01:04 +0000)
     and '7dcfdc2af0ae972634d8a71244289786c34a446b'


Trivial merge