merge of '012918bd735cf9750bdb63d703299e3bd4bf2650'
authorRod Whitby <rod@whitby.id.au>
Thu, 22 Mar 2007 23:59:18 +0000 (23:59 +0000)
committerRod Whitby <rod@whitby.id.au>
Thu, 22 Mar 2007 23:59:18 +0000 (23:59 +0000)
     and '41b8e1c230e8499abea8431580a55e91ef4b1e43'


Trivial merge