merge of '44926b8def1aa09fa2284a3f5e6caffacb77ede9'
authorRod Whitby <rod@whitby.id.au>
Wed, 26 Dec 2007 11:14:36 +0000 (11:14 +0000)
committerRod Whitby <rod@whitby.id.au>
Wed, 26 Dec 2007 11:14:36 +0000 (11:14 +0000)
     and '8f4f4a96be49747ae2c3c51e51854655b4fc65b6'


Trivial merge