Merge with trunk

bzr revid: rgaopenerp-20121108105413-f9hqh2d5jn4z50g3

openerp/addons/base/base_data.xml

@@ -69,6 +69,7 @@
             <field name="name">Administrator</field>
             <field name="company_id" ref="main_company"/>
             <field name="customer" eval="False"/>
+            <field name="email">admin@example.com</field>
         </record>
 
         <record model="res.users" id="base.user_root">

openerp/addons/base/base_demo.xml

@@ -5,6 +5,7 @@
             <field name="name">Demo User</field>
             <field name="company_id" ref="main_company"/>
             <field name="customer" eval="False"/>
+            <field name="email">demo@example.com</field>
         </record>
         <record id="user_demo" model="res.users">
             <field name="partner_id" ref="base.partner_demo"/>
@@ -15,6 +16,10 @@
             <field name="groups_id" eval="[(6,0,[ref('base.group_user')])]"/>
         </record>
 
+        <record model="res.partner" id="base.partner_root">
+            <field name="email">admin@example.com</field>
+        </record>
+
         <!-- new rate for demo transactions in multi currency -->
         <record id="rateUSDbis" model="res.currency.rate">
             <field name="rate">1.5289</field>

openerp/addons/base/res/res_users_view.xml

@@ -202,6 +202,7 @@
                         <field name="name" readonly="1" class="oe_inline"/>
                         (<field name="login" readonly="1" class="oe_inline"/>)
                     </h1>
+                    <button name="preference_change_password" type="object" string="Change password" class="oe_link"/>
                     <group name="preferences" col="4">
                         <field name="lang" readonly="0"/>
                         <field name="tz" readonly="0"/>
@@ -213,7 +214,6 @@
                         <field name="signature" readonly="0"/>
                     </group>
                     <footer>
-                        <button name="preference_change_password" type="object" string="Change password"/>
                         <button name="preference_save" type="object" string="Save"/>
                         or
                         <button name="preference_cancel" string="Cancel" special="cancel" class="oe_link"/>

setup.py

@@ -126,7 +126,6 @@ setuptools.setup(
           'vobject',
           'werkzeug',
           'xlwt',
-          'zsi', # optional
       ],
       extras_require = {
           'SSL' : ['pyopenssl'],