merge of '18890ff50a360315f132ff446f7a44ae0dcb4061'
authorRod Whitby <rod@whitby.id.au>
Sun, 23 Dec 2007 20:52:52 +0000 (20:52 +0000)
committerRod Whitby <rod@whitby.id.au>
Sun, 23 Dec 2007 20:52:52 +0000 (20:52 +0000)
     and '51181b2162a577bd188446458dc9adf512663dbb'


Trivial merge