merge of '4d795eb920749e4b57552891946fac066af26b7d'
authorRod Whitby <rod@whitby.id.au>
Wed, 5 Sep 2007 11:35:09 +0000 (11:35 +0000)
committerRod Whitby <rod@whitby.id.au>
Wed, 5 Sep 2007 11:35:09 +0000 (11:35 +0000)
     and '5a5cc51c5fae5d7a5cadc191efc39fca008780c8'


Trivial merge