Merge branch 'state'
authorRichard Whitehouse <github@richardwhiuk.com>
Sun, 8 May 2011 00:49:18 +0000 (01:49 +0100)
committerRichard Whitehouse <github@richardwhiuk.com>
Sun, 8 May 2011 00:49:18 +0000 (01:49 +0100)

Trivial merge