Merge remote-tracking branches 'spirit', 'crybaby' and 'staging'
[profile] / bin / emerge-hack
2009-07-18 Mark WoodingGreat reorganization.