Merge branch 'master' of https://source.jalview.org/git/jalview
authorjprocter <jprocter@compbio.dundee.ac.uk>
Tue, 5 Jul 2011 11:24:24 +0000 (12:24 +0100)
committerjprocter <jprocter@compbio.dundee.ac.uk>
Tue, 5 Jul 2011 11:24:24 +0000 (12:24 +0100)

Trivial merge