Merge branch 'JAL-1130' into develop
authorjprocter <jprocter@compbio.dundee.ac.uk>
Fri, 21 Sep 2012 16:26:54 +0000 (17:26 +0100)
committerjprocter <jprocter@compbio.dundee.ac.uk>
Fri, 21 Sep 2012 16:26:54 +0000 (17:26 +0100)

Trivial merge