[MERGE]:merged account data for subtype

bzr revid: apa@tinyerp.com-20120903064341-t508t4w1si54iarw

diff --cc addons/sale/sale_data.xml
index a23ab40,a9c0e18..2f4b81b
--- 1/addons/sale/sale_data.xml
--- 2/addons/sale/sale_data.xml
+++ b/addons/sale/sale_data.xml
@@@ -55,8 -56,8 +55,8 @@@ If you need to manage your sales pipeli
              <field name="model_ids" eval="[(4,ref('sale.model_sale_order'))]"/>
              <field name="default" eval="False"/>
          </record>
--        <record id="mail.mail_subtype_cancel" model="mail.message.subtype">
 -            <field name="name">cancel</field>
++        <record id="mail.mail_subtype_cancelled" model="mail.message.subtype">
 +            <field name="name">cancelled</field>
              <field name="model_ids" eval="[(4,ref('sale.model_sale_order'))]"/>
              <field name="default" eval="False"/>
          </record>