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