Merge branch 'JAL-368_dragabovedesktop' into Release_2_7_Branch
authorjprocter <jprocter@compbio.dundee.ac.uk>
Mon, 21 Nov 2011 18:57:54 +0000 (18:57 +0000)
committerjprocter <jprocter@compbio.dundee.ac.uk>
Mon, 21 Nov 2011 18:57:54 +0000 (18:57 +0000)

Trivial merge