[MERGE] Merge with trunk
authorFabien Meghazi <fme@openerp.com>
Thu, 25 Aug 2011 11:59:19 +0000 (13:59 +0200)
committerFabien Meghazi <fme@openerp.com>
Thu, 25 Aug 2011 11:59:19 +0000 (13:59 +0200)
commit39d2fbbce663977b90bc39880b0ad1a06595fd11
tree81e6c980f81ad19984b21aab8488dc489c0c7a16
parenta54a00ea62ab5813069e32678b9c6c3a3790145d
parentc8bb3c1ea5646d30b5ccc5acb355fb8cce3459bc
[MERGE] Merge with trunk

bzr revid: fme@openerp.com-20110825115919-vbpn3111a0gwjl13