Merge branch 'state'
authorRichard Whitehouse <github@richardwhiuk.com>
Sat, 7 May 2011 17:58:17 +0000 (18:58 +0100)
committerRichard Whitehouse <github@richardwhiuk.com>
Sat, 7 May 2011 17:58:17 +0000 (18:58 +0100)

Trivial merge