Merge branch 'JAL-1023_viewall2structsw7' into Release_2_7_Branch
authorjprocter <jprocter@compbio.dundee.ac.uk>
Wed, 11 Jan 2012 13:39:01 +0000 (13:39 +0000)
committerjprocter <jprocter@compbio.dundee.ac.uk>
Wed, 11 Jan 2012 13:39:01 +0000 (13:39 +0000)

Trivial merge