[MERGE] + [BUG] lp:673895

bzr revid: tfr@openerp.com-20101124121911-n0w6gwov6zopw4ul

addons/crm/crm_meeting.py

@@ -188,7 +188,7 @@ class res_users(osv.osv):
             view_id  = data_obj.browse(cr, uid, data_id, context=context).res_id
             self.pool.get('ir.ui.view_sc').copy(cr, uid, view_id, default = {
                                         'user_id': user_id}, context=context)
-        except ValueError:
+        except:
             # Tolerate a missing shortcut. See product/product.py for similar code.
             logging.getLogger('orm').warning('Skipped Products shortcut for user "%s"', data.get('name','<new'))
             

addons/thunderbird/plugin/openerp_plugin/packaging.sh

@@ -1,3 +1,6 @@
+# Use this Shell Script for Cleaning & Compressing  the chnages in Plugin 
+# Run this script using jar command.
+
 rm chrome/openerp_plugin.jar
 rm ../openerp_plugin.xpi 
 cd chrome/openerp_plugin/