Merge branch 'JAL-1040_jar_manifest_fix' into develop
authorjprocter <jprocter@compbio.dundee.ac.uk>
Tue, 17 Jan 2012 11:08:13 +0000 (11:08 +0000)
committerjprocter <jprocter@compbio.dundee.ac.uk>
Tue, 17 Jan 2012 11:08:13 +0000 (11:08 +0000)

Trivial merge