commit 391dae972053439eade0104b790594076760f4c9 Merge: 7ab99ca f11264d Author: Adam Huffman <adam.huffman at manchester.ac.uk> Date: Thu Aug 5 10:48:29 2010 +0100 Merge remote branch 'origin/f13/master' ---