Merge branch 'master' of richardwhiuk.com:ii-diss
authorRichard Whitehouse <github@richardwhiuk.com>
Tue, 17 May 2011 13:32:12 +0000 (14:32 +0100)
committerRichard Whitehouse <github@richardwhiuk.com>
Tue, 17 May 2011 13:32:12 +0000 (14:32 +0100)

Trivial merge