Merge branch 'JAL-976_jabaws2supp' into develop
authorjprocter <jprocter@compbio.dundee.ac.uk>
Wed, 28 Mar 2012 13:57:23 +0000 (14:57 +0100)
committerjprocter <jprocter@compbio.dundee.ac.uk>
Wed, 28 Mar 2012 13:57:23 +0000 (14:57 +0100)

Trivial merge