Merge branch 'JAL-976_jabaws2supp' into develop
authorjprocter <jprocter@compbio.dundee.ac.uk>
Mon, 7 Nov 2011 13:20:40 +0000 (13:20 +0000)
committerjprocter <jprocter@compbio.dundee.ac.uk>
Mon, 7 Nov 2011 13:20:40 +0000 (13:20 +0000)

Trivial merge