Merge branch 'menard' into develop_m2_8_1_2
authorJim Procter <jprocter@compbio.dundee.ac.uk>
Fri, 24 May 2013 15:01:56 +0000 (16:01 +0100)
committerJim Procter <jprocter@compbio.dundee.ac.uk>
Fri, 24 May 2013 15:01:56 +0000 (16:01 +0100)

Trivial merge