Merge branch 'JAL-976_jabaws2supp' into develop
authorjprocter <jprocter@compbio.dundee.ac.uk>
Tue, 8 Nov 2011 11:55:30 +0000 (11:55 +0000)
committerjprocter <jprocter@compbio.dundee.ac.uk>
Tue, 8 Nov 2011 11:55:30 +0000 (11:55 +0000)

Trivial merge