Merge branch 'bugs/JAL-1138_osgi' into Release_2_8_2_Branch
authorJim Procter <j.procter@dundee.ac.uk>
Fri, 3 Oct 2014 10:00:46 +0000 (11:00 +0100)
committerJim Procter <j.procter@dundee.ac.uk>
Fri, 3 Oct 2014 10:00:46 +0000 (11:00 +0100)

Trivial merge