merge of 2040fbc4df2aa380693c353ed60010c6857265d0
authorRod Whitby <rod@whitby.id.au>
Wed, 27 Dec 2006 13:51:04 +0000 (13:51 +0000)
committerRod Whitby <rod@whitby.id.au>
Wed, 27 Dec 2006 13:51:04 +0000 (13:51 +0000)
     and ef924411754c1c1f26a65eae1204fc70c19ceafa


Trivial merge