merge of '3caac13a21da93a3af0a8093fe60883fccd0399f'
authorRod Whitby <rod@whitby.id.au>
Wed, 16 Jan 2008 04:37:45 +0000 (04:37 +0000)
committerRod Whitby <rod@whitby.id.au>
Wed, 16 Jan 2008 04:37:45 +0000 (04:37 +0000)
     and '3d85f32ae343659587f7a1f2da9e4a8ed3e568a1'


Trivial merge