diff SMALL @ 374:87ae4565679d channel-fix

merge of 'a94c5265558121fe936519b5d9a5eb27f95e9d9d' and 'd348546b80847bc0d42a7b5208bb31a54f1fdfaf'
author Matt Johnston <matt@ucc.asn.au>
date Tue, 05 Dec 2006 13:28:44 +0000
parents b9d3f725e00b
children 13cb8cc1b0e4
line wrap: on
line diff