More EVMS 1.1 CVS synchronization.

Fix up logging macros to use __FUNCTION__ correctly.

2 files changed