[MERGE] Upstream
authorStephane Wirtel <stw@openerp.com>
Wed, 5 Oct 2011 14:59:31 +0000 (16:59 +0200)
committerStephane Wirtel <stw@openerp.com>
Wed, 5 Oct 2011 14:59:31 +0000 (16:59 +0200)
commitb9302052c86fad98787d4f57aeb398ae9ebcc96a
treef0fccbe68388723ed29570b9d965b0a70fd654bd
parentb8f9bad1a12ddd93ac0e86a0e08631bdb2f58a32
parent708802c3575d5285309eb6bfb888ba583e00075c
[MERGE] Upstream

bzr revid: stw@openerp.com-20111005145931-piwiavbep6sr8nx3