Merge branch 'refactor' into snapshotserver
authorAndy Allan <andy@gravitystorm.co.uk>
Fri, 17 Jun 2011 12:50:23 +0000 (13:50 +0100)
committerAndy Allan <andy@gravitystorm.co.uk>
Fri, 17 Jun 2011 12:50:23 +0000 (13:50 +0100)

Trivial merge