cmdebug-merge-20051024