Merge branch 'tom_dev'
authorTom Kistner <tom@tahini.csx.cam.ac.uk>
Sun, 8 May 2011 09:08:12 +0000 (10:08 +0100)
committerTom Kistner <tom@tahini.csx.cam.ac.uk>
Sun, 8 May 2011 09:08:12 +0000 (10:08 +0100)

Trivial merge