# HG changeset patch
# User Matt Johnston <matt@ucc.asn.au>
# Date 1170490847 0
# Node ID a7eb64b9966a8d301b1b1a7f1e761507e575a7f6
# Parent  a5bca950120da94b1da0b8254a4caf5149a14f05# Parent  dc37bd8563e820300c23c4971206ee853f523a69
merge of '7ac513addd924cd0391e7db26c067024c3c257f6'
     and 'b24757c764465a206a258bae27ac0509fc56cd16'

diff -r a5bca950120d -r a7eb64b9966a common-channel.c