Merge branch 'JAL-972-jdas' into develop
authorjprocter <jprocter@compbio.dundee.ac.uk>
Mon, 14 May 2012 10:37:08 +0000 (11:37 +0100)
committerjprocter <jprocter@compbio.dundee.ac.uk>
Mon, 14 May 2012 10:37:08 +0000 (11:37 +0100)

Trivial merge