[MERGE] Sync with trunk, because of the last fixes to have a green runbot.
authorThibault Delavallée <tde@openerp.com>
Thu, 15 Nov 2012 10:38:16 +0000 (11:38 +0100)
committerThibault Delavallée <tde@openerp.com>
Thu, 15 Nov 2012 10:38:16 +0000 (11:38 +0100)
commitdfa48f425d55201ab4d22350819cec02e5b4a19a
tree57b7a4c8f11c9a15aea72abd466bfa8073b8e460
parent15b23a76aeded2cff747d1dedaeab6ae6357eb27
parentd3cf004baeba4e1d0b26a6d4f0ce1cb0e2138575
[MERGE] Sync with trunk, because of the last fixes to have a green runbot.

bzr revid: tde@openerp.com-20121115103816-8m7f0zxujczjwx2a