Merging safemode branch -r12653, some minor parts of 12654 were stepped on but the overall effect is the same, builds and runs with both cmake and automake
Authored by: safemode 2010-02-27
Parent: [r12654]
Child: [r12656]