Merge branch 'master' into analysis
authorRichard Whitehouse <github@richardwhiuk.com>
Tue, 17 May 2011 19:55:01 +0000 (20:55 +0100)
committerRichard Whitehouse <github@richardwhiuk.com>
Tue, 17 May 2011 19:55:01 +0000 (20:55 +0100)

Trivial merge