merge of '18d45ae122d3ca0b93e65c8b3dd5b5d599faa353'
authorRod Whitby <rod@whitby.id.au>
Wed, 29 Nov 2006 11:57:28 +0000 (11:57 +0000)
committerRod Whitby <rod@whitby.id.au>
Wed, 29 Nov 2006 11:57:28 +0000 (11:57 +0000)
commit7d0259ee22ec926260473a4d6ff82f8420cb946b
treee019383ce34a0604386ff047b252bd8a69df7f6c
parent28bc06eb20023532e9c93df76cb57fe18fc59b77
parentc387f4c5858ead16e2817a3370b649551be9d5a9
Merge ... '18d45ae122d3ca0b93e65c8b3dd5b5d599faa353'
     and 'a052255457a42850dee32c7e42a8d43e98edf445'