merge of '506b85082c41d0d7ce9fd08a712622475cfcc48d'
authorRod Whitby <rod@whitby.id.au>
Sun, 23 Sep 2007 13:52:07 +0000 (13:52 +0000)
committerRod Whitby <rod@whitby.id.au>
Sun, 23 Sep 2007 13:52:07 +0000 (13:52 +0000)
     and '7068e31d13e1006027e2fa9ad5f9b3887c570b94'


Trivial merge