Merge remote-tracking branch 'origin'
[profile] / bin / xinitcmd
2009-07-18 Mark WoodingGreat reorganization.