merge of '6c22fef7b920ae43c2fbce7a9e19083391b1a445'
authorRod Whitby <rod@whitby.id.au>
Mon, 12 Mar 2007 13:53:35 +0000 (13:53 +0000)
committerRod Whitby <rod@whitby.id.au>
Mon, 12 Mar 2007 13:53:35 +0000 (13:53 +0000)
     and '87d12e6784859dc88ead3df8e50d97340f10b881'


Trivial merge