merge

bzr revid: fp@tinyerp.com-20100418200708-7n2al0jetjre1qlw

addons/base_setup/base_setup_todo.xml

@@ -14,7 +14,7 @@
           <group string="res_config_contents" position="replace">
             <field name="company_id" invisible="1"/>
 
-            <separator string="Define Main Company" colspan="4"/>
+            <separator string="Configure Your Company" colspan="4"/>
             <field name="name" colspan="4" required="True"/>
             <newline/>
             <field name="street"/>