[MERGE] [FORWARD] Forward-port of 7.0 branch until rev 9143.
authorThibault Delavallée <tde@openerp.com>
Tue, 21 May 2013 13:06:27 +0000 (15:06 +0200)
committerThibault Delavallée <tde@openerp.com>
Tue, 21 May 2013 13:06:27 +0000 (15:06 +0200)
commit90c7ed2f837ee0494854e3215dc613ef393eea98
tree538d7d657e0e9ec8c6ff7fd24c7f8de091db7422
parenta3949476992b25ce9d784eecdf68b43b2c1ac206
parenta05b0bebbe95ea92ab188af5ef22c4b724979fdd
[MERGE] [FORWARD] Forward-port of 7.0 branch until rev 9143.

bzr revid: tde@openerp.com-20130521130627-i7zff51rn8xl7dzk