[MERGE] merge cha branch to get all updates related to description updates

bzr revid: psi@tinyerp.com-20120702094807-qv8ktldjz1spox8k

diff --cc addons/mrp_operations/__openerp__.py
index 1361f2e,3fc06f9..61b745b
--- 1/addons/mrp_operations/__openerp__.py
--- 2/addons/mrp_operations/__openerp__.py
+++ b/addons/mrp_operations/__openerp__.py
@@@ -25,7 -25,7 +25,7 @@@
      'version': '1.0',
      'category': 'Manufacturing',
      'description': """
- This module adds state, date_start,date_stop in production order operation lines (in the "Work Centers" tab).
 -This module adds state, date_start,date_stop in manufacturing order operation lines (in the "Work Orders" tab).
++This module adds state, date_start, date_stop in manufacturing order operation lines (in the "Work Orders" tab).
  =============================================================================================================
  
  Status: draft, confirm, done, cancel