Resolved minor whitespace conflict.
Merge branch 'master' of git://github.com/ukwa/monitrix
Merge branch 'master' of git://github.com/ukwa/monitrix
Merge branch 'master' of git://github.com/ukwa/monitrix
Merge branch 'master' of git://github.com/ukwa/monitrix
Merge branch 'master' of git://github.com/ukwa/monitrix
Merge branch 'master' of git://github.com/ukwa/monitrix
Fixed up shortening.