[MERGE] sync with 7.0 (getting needed orm revision)
authorMartin Trigaux <mat@openerp.com>
Thu, 13 Feb 2014 13:01:50 +0000 (14:01 +0100)
committerMartin Trigaux <mat@openerp.com>
Thu, 13 Feb 2014 13:01:50 +0000 (14:01 +0100)
bzr revid: mat@openerp.com-20140213130150-9ltjazqiru5apv5k


Trivial merge