Merge remote branch 'crybaby'
[profile] / el / Makefile
2009-07-18 Mark WoodingGreat reorganization.