[MERGE] Sync with 7.0
authorThibault Delavallée <tde@openerp.com>
Wed, 30 Jan 2013 12:36:22 +0000 (13:36 +0100)
committerThibault Delavallée <tde@openerp.com>
Wed, 30 Jan 2013 12:36:22 +0000 (13:36 +0100)
commitd57be0a0c06ccd86848249193ce3e366d54e3e03
tree586dc6396a76a81987910b109110a6dd3873e241
parente9f6e0036eae84dd828ed68e4eb9397bf0573c2e
parentdbe131235555d2f9f08aff4d554dcec379d776a9
[MERGE] Sync with 7.0

bzr revid: tde@openerp.com-20130130123622-5heyerp2aem4wjv3