Merge Opie-Console_CVS Conflict