Merge branch 'JWS-27-jronn' into JABAWS_Release_2_0 origin/JABAWS_Release_2_0
authorjprocter <jprocter@compbio.dundee.ac.uk>
Mon, 4 Jun 2012 16:08:56 +0000 (17:08 +0100)
committerjprocter <jprocter@compbio.dundee.ac.uk>
Mon, 4 Jun 2012 16:08:56 +0000 (17:08 +0100)

Trivial merge