Merging in other peoples fixes, and fixing redhat bug #17

Open

timgriffiths wants to merge 1 commit intoL2G:masterfrom

timgriffiths:fixes

Commits on Nov 29, 2013

Merging in other peoples fixes, and fixing obvious redhat bug (ie it doesn't work)
timgriffiths
committed