merge w/ devel
merge w/ pahoughton-devel
Merge branch 'master' into pahoughton-devel
lazy man's dns - add vgsh - ssh to a virtual guest using it's name.
cleanup