Commit 610cf0f0a5cb5d962ddf0082a4094815502554dd

Con Kolivas 2012-07-03T10:48:42

Minor style changes.