Expanded cvs log keywords by syncing with cvs
Slightly cleaned up (doxygen) comments