merge of 4a314ca9c007e9d4eb374d347d7d82585e1fc69a
authorRod Whitby <rod@whitby.id.au>
Sat, 16 Dec 2006 16:32:09 +0000 (16:32 +0000)
committerRod Whitby <rod@whitby.id.au>
Sat, 16 Dec 2006 16:32:09 +0000 (16:32 +0000)
     and d6e69351555033b3ced6ef08ee078fd3b64c2825


Trivial merge