Merge branch 'master' of https://source.jalview.org/git/jalview
authorjprocter <jprocter@compbio.dundee.ac.uk>
Wed, 3 Aug 2011 13:44:43 +0000 (14:44 +0100)
committerjprocter <jprocter@compbio.dundee.ac.uk>
Wed, 3 Aug 2011 13:44:43 +0000 (14:44 +0100)

Trivial merge