[MERGE] Sync with 7.0.
authorThibault Delavallée <tde@openerp.com>
Mon, 7 Jan 2013 09:26:45 +0000 (10:26 +0100)
committerThibault Delavallée <tde@openerp.com>
Mon, 7 Jan 2013 09:26:45 +0000 (10:26 +0100)
commit906345b5b8074da89c5d693e13bd7fe839555b92
tree59333d1c9e86fa2e5831396007b8c8c38751c4b6
parent2156c8368773082f6b685e37d9725dbc696adadc
parenta35080348c6dca4a9736fe4fa6190f9a47ca632d
[MERGE] Sync with 7.0.

bzr revid: tde@openerp.com-20130107092645-dkqhjb5vv54yubuf