# HG changeset patch
# User Stu Tomlinson <stu@nosnilmot.com>
# Date 1178256526 0
# Node ID d8e16018a9beda6c02208f1c5ead807b00790e30
# Parent  228fc699dadb60f288f4bce18385589f28bf8eea# Parent  e7f75084d05961d3d0397088d9b2ce8f7f31cd5d
merge of '23377eb2770b8f45c3d732466c4fae99a90220f1'
     and '8f99a08aaf41285d540017a3eeff5cc816c85403'

diff -r 228fc699dadb -r d8e16018a9be NEWS