merge of '159e0203ae3c554f80e3e2a3e60c667d512714af'
authorRod Whitby <rod@whitby.id.au>
Sat, 17 Mar 2007 20:10:07 +0000 (20:10 +0000)
committerRod Whitby <rod@whitby.id.au>
Sat, 17 Mar 2007 20:10:07 +0000 (20:10 +0000)
     and '5b6c7e1ca56b6b00f76eabbab125b6a4bd439c24'


Trivial merge