[ros-diffs] [fireball] 23365: Move two helper macros into cm.h, and uncomment DPRINTs using them in registry code