merge of '4d056d24e9fd51cc15a2cafe9af79d82160d469c'
authorRod Whitby <rod@whitby.id.au>
Sun, 17 Aug 2008 12:52:24 +0000 (12:52 +0000)
committerRod Whitby <rod@whitby.id.au>
Sun, 17 Aug 2008 12:52:24 +0000 (12:52 +0000)
     and '6cb662ad89603f32ad694010567c8c8a850a7516'


Trivial merge