Merge branch 'JWS-35' into JABAWS_Release_2_0
authorjprocter <jprocter@compbio.dundee.ac.uk>
Thu, 31 May 2012 17:31:28 +0000 (18:31 +0100)
committerjprocter <jprocter@compbio.dundee.ac.uk>
Thu, 31 May 2012 17:31:28 +0000 (18:31 +0100)

Trivial merge