Merge from dev
authorRichard Whitehouse <github@richardwhiuk.com>
Tue, 22 Feb 2011 22:54:51 +0000 (22:54 +0000)
committerRichard Whitehouse <github@richardwhiuk.com>
Tue, 22 Feb 2011 22:54:51 +0000 (22:54 +0000)

Trivial merge