info/mismerge-20120118/fix

mca@sanger.ac.uk

79cee888 · Undo the effects of some bad merge commits. · Jan 20, 2012

This tag records a fix for some merge errors.
The details are in the message of the merge commit.
The bad commits are tagged info/mismerge-20120118/bad-merge-* .