+ src/jsoncpp/Makefile.am: don't clobber AM_CPPFLAGS
+ cleared svn:executable flag from **/CMakeLists.txt
+ added emacs indentation-style variables to all *.c, *.cpp, *.h files
oops: reverted commit 1308 (should happen on delwin-merge branch first)
+ no-op: merged r1178:1179 from 'delwin' branch into delwin-merge (for re-integration into delwin branch)
review: merged r1291:1294 from 'delwin' branch into delwin-merge (merge complete, testing commences)
review: merged r1286:1291 from 'delwin' branch into delwin-merge (fixed other missing return value bug in DDCTimeAvg::Append)
review: merged r1263:1286 from 'delwin' branch into delwin-merge (resolved some TermExpander.cpp conflicts)
review: merged r1260:1263 from 'delwin' branch into delwin-merge (resolved more ConcordOptions.cpp conflicts)