Merge lp:openobject-server

bzr revid: jam@tinyerp.com-20120817044741-thqezvmy7iaphkea
bzr revid: jam@tinyerp.com-20120821043844-4wf3dcxbbbokhe5l
bzr revid: jam@tinyerp.com-20120827043023-kz2bbk8fvfv4gkh5

diff --cc openerp/addons/base/rng/view.rng
index b82c96f,0d6527e..dfeeb03
--- 1/openerp/addons/base/rng/view.rng
--- 2/openerp/addons/base/rng/view.rng
+++ b/openerp/addons/base/rng/view.rng
@@@ -184,10 -181,12 +184,13 @@@
  
      <rng:define name="diagram">
          <rng:element name="diagram">
 -            <rng:optional><rng:attribute name="string"/></rng:optional>                                    
 +            <rng:optional><rng:attribute name="create" /></rng:optional>
 +            <rng:optional><rng:attribute name="string"/></rng:optional>
              <rng:ref name="node"/>
-             <rng:ref name="arrow"/>
+             <rng:ref name="arrow"/>            
+             <rng:zeroOrMore>
+                 <rng:ref name="label"/>
+             </rng:zeroOrMore>
          </rng:element>
      </rng:define>