Merge commit 'ponder'
[profile] / dot / mg
2009-07-18 Mark WoodingGreat reorganization.