# HG changeset patch
# User Matt Johnston <matt@ucc.asn.au>
# Date 1170490845 0
# Node ID a5bca950120da94b1da0b8254a4caf5149a14f05
# Parent  4f2dbd1c36856240c4c34e01bba7a886c46f1324# Parent  2908122e9eedbdffcad221eca46601ef3d364f82
merge of '1dfbc5ef92391d01b576c8506061927869a89887'
     and '275426b7a4b94a0507c78327f86bcd2cd0b0f985'

diff -r 4f2dbd1c3685 -r a5bca950120d common-channel.c
diff -r 4f2dbd1c3685 -r a5bca950120d svr-chansession.c