merge of '050cc7da614b31484f65138eb5faa6715af3fc5c'
authorRod Whitby <rod@whitby.id.au>
Sat, 7 Jul 2007 11:52:02 +0000 (11:52 +0000)
committerRod Whitby <rod@whitby.id.au>
Sat, 7 Jul 2007 11:52:02 +0000 (11:52 +0000)
     and 'f3312a5f747d70b34f246bcf7563edf94614d025'


Trivial merge