merge of '0fd461d5e625d032704c778f13e5a3748bae0ae4'
authorRod Whitby <rod@whitby.id.au>
Sat, 24 Mar 2007 21:58:55 +0000 (21:58 +0000)
committerRod Whitby <rod@whitby.id.au>
Sat, 24 Mar 2007 21:58:55 +0000 (21:58 +0000)
     and '873714b772263da7a8f353e2f236a7de9f6ac567'


Trivial merge