merge of 'd8bfa63aa913e7227790ba2d02253cfbecce61ab'
authorRod Whitby <rod@whitby.id.au>
Sun, 23 Dec 2007 10:13:33 +0000 (10:13 +0000)
committerRod Whitby <rod@whitby.id.au>
Sun, 23 Dec 2007 10:13:33 +0000 (10:13 +0000)
     and 'e49af3b0c9501d9799a24ac39d4afbb1c92ff181'


Trivial merge