Merge branch 'master' into demodiss
authorRichard Whitehouse <github@richardwhiuk.com>
Mon, 31 Jan 2011 19:21:24 +0000 (19:21 +0000)
committerRichard Whitehouse <github@richardwhiuk.com>
Mon, 31 Jan 2011 19:21:24 +0000 (19:21 +0000)

Trivial merge