Commit 93800e57904a42b1c235ec199548fe5247705856

Con Kolivas 2011-07-06T13:19:56

More output tidy.