Merge branch 'JAL-976_jabaws2supp' into develop
authorjprocter <jprocter@compbio.dundee.ac.uk>
Thu, 3 Nov 2011 18:21:57 +0000 (18:21 +0000)
committerjprocter <jprocter@compbio.dundee.ac.uk>
Thu, 3 Nov 2011 18:21:57 +0000 (18:21 +0000)

Trivial merge