[MERGE] Sync with trunk
authorThibault Delavallée <tde@openerp.com>
Mon, 18 Mar 2013 10:18:28 +0000 (11:18 +0100)
committerThibault Delavallée <tde@openerp.com>
Mon, 18 Mar 2013 10:18:28 +0000 (11:18 +0100)
commitde5a303c4d2711d0bd0aabd6d5e994ef052d44bf
treec93ddf116f9d46a1df5febeaef4f437e41337ea5
parent4484a3197ca558341ce595df41ffdc072a8d05d2
parent4ce8d2697d47f5fef279985a78059e34bee6f3ba
[MERGE] Sync with trunk

bzr revid: tde@openerp.com-20130318101828-6csyuhmutrvm5ld5