[bwa/f13/master: 13/14] Merge remote branch 'origin/f12/master'

[verdurin]

commit 995ecb7751d6894ddfc8fdaac5ddbe8c3d5f7e3b
Merge: 391dae9 a937112
Author: Adam Huffman <adam.huffman at manchester.ac.uk>
Date:   Thu Aug 5 10:48:38 2010 +0100

    Merge remote branch 'origin/f12/master'

---