merge of '2b1cc78c259b50ef47b34d85e4f6717f64d1d093'
authorRod Whitby <rod@whitby.id.au>
Sun, 17 Jun 2007 05:37:26 +0000 (05:37 +0000)
committerRod Whitby <rod@whitby.id.au>
Sun, 17 Jun 2007 05:37:26 +0000 (05:37 +0000)
     and 'ed459a8f7a87918dd43a1513e367c3dd386e56be'


Trivial merge