Merge Opie-Console_CVS Conflict
[vuplus_openembedded] / opie-today-mailplugin / opie-today-mailplugin_1.1.6.oe