commit 9ef7747f50580836335eb76e6714d092e9a66419 Merge: 995ecb7 73fa476 Author: Adam Huffman <adam.huffman at manchester.ac.uk> Date: Thu Aug 5 10:48:46 2010 +0100 Merge remote branch 'origin/el5/master' ---