[MERGE] latest trunk

bzr revid: odo@openerp.com-20110912122217-a3fy0gmxbu18kemr

diff --combined openerp/addons/base/rng/view.rng
index 0eca115,2e2dad1..0a84308
--- 1/openerp/addons/base/rng/view.rng
--- 2/openerp/addons/base/rng/view.rng
+++ b/openerp/addons/base/rng/view.rng
@@@ -207,7 -207,6 +207,7 @@@
              <rng:optional><rng:attribute name="help"/></rng:optional>
              <rng:optional><rng:attribute name="width"/></rng:optional>
              <rng:optional><rng:attribute name="wrap"/></rng:optional>
 +            <rng:optional><rng:attribute name="name"/></rng:optional>
              <rng:zeroOrMore>
                  <rng:choice>
                      <rng:ref name="notebook"/>
@@@ -471,6 -470,8 +471,8 @@@
              <rng:optional><rng:attribute name="selection"/></rng:optional>
              <rng:optional><rng:attribute name="default_focus"/></rng:optional>
              <rng:optional><rng:attribute name="filters"/></rng:optional>
+             <rng:optional><rng:attribute name="statusbar_visible"/></rng:optional>
+             <rng:optional><rng:attribute name="statusbar_colors"/></rng:optional>
              <rng:zeroOrMore>
                  <rng:choice>
                      <rng:ref name="diagram"/>