merge of '3c6cac2f7866c98f3be3988d689e3137cf037175'
authorRod Whitby <rod@whitby.id.au>
Sat, 24 Mar 2007 05:25:35 +0000 (05:25 +0000)
committerRod Whitby <rod@whitby.id.au>
Sat, 24 Mar 2007 05:25:35 +0000 (05:25 +0000)
     and '767f227d69ff905c612a340e4fa0bcc993f00158'


Trivial merge