merge of '39125d69491c9f3a5452771d45c4bacdfc07e67d'
authorRod Whitby <rod@whitby.id.au>
Sun, 24 Sep 2006 19:20:39 +0000 (19:20 +0000)
committerRod Whitby <rod@whitby.id.au>
Sun, 24 Sep 2006 19:20:39 +0000 (19:20 +0000)
     and '4f6bdecad243ff8ec5ee4769bff913c985fad72b'


Trivial merge