merge of '79b37f286afab909bc3f1f60b70ee2f4b2b54cbb'
authorRod Whitby <rod@whitby.id.au>
Tue, 2 Jan 2007 20:04:59 +0000 (20:04 +0000)
committerRod Whitby <rod@whitby.id.au>
Tue, 2 Jan 2007 20:04:59 +0000 (20:04 +0000)
     and 'f3fc249ebe1706f1e7f3013e7d83dbdea6b9cabe'


Trivial merge