Merge branch 'master' of https://source.jalview.org/git/jalview
authorjprocter <jprocter@compbio.dundee.ac.uk>
Tue, 17 May 2011 09:07:32 +0000 (10:07 +0100)
committerjprocter <jprocter@compbio.dundee.ac.uk>
Tue, 17 May 2011 09:07:32 +0000 (10:07 +0100)

Trivial merge