[Merge] Merged with trunk

bzr revid: ggh@tinyerp.com-20130201051124-0w8ms2zytfrophdc
bzr revid: ggh@tinyerp.com-20130201071051-zjwehwvmcwxvdbx7

addons/crm/crm_lead_demo.xml

@@ -360,7 +360,7 @@ Andrew</field>
             <field name="type_id" ref="type_lead5"/>
             <field name="categ_ids" eval="[(6, 0, [categ_oppor5])]"/>
             <field name="priority">2</field>
-            <field eval="time.strftime('%Y-%m-30')" name="date_deadline"/>
+            <field eval="time.strftime('%Y-%m-28')" name="date_deadline"/>
             <field eval="time.strftime('%Y-%m-1')" name="date_action"/>
             <field name="title_action">Convert to quote</field>
             <field name="section_id" ref="crm_case_section_1"/>