Merge branch 'people/frew/mega-refactor'
Peter Rabbitson [Sat, 4 Feb 2012 21:06:03 +0000 (22:06 +0100)]

Trivial merge