merge of '6f4b6bf3d2e7f2cfd02b30cd615680a0a673fe68'
authorRod Whitby <rod@whitby.id.au>
Sun, 25 Mar 2007 13:09:21 +0000 (13:09 +0000)
committerRod Whitby <rod@whitby.id.au>
Sun, 25 Mar 2007 13:09:21 +0000 (13:09 +0000)
     and 'd7114bf167db1226dc6a0dbcf6f063728c94eaf0'


Trivial merge