[MERGE] Upstream
authorStephane Wirtel <stw@openerp.com>
Tue, 17 Apr 2012 08:38:21 +0000 (10:38 +0200)
committerStephane Wirtel <stw@openerp.com>
Tue, 17 Apr 2012 08:38:21 +0000 (10:38 +0200)
commit92c634bca2911b8101a6d389c02c72288c9be88a
treeb875be8d30fc16df2df9c32274efb1b59b58a8d0
parent938ae552fa4fc5f46837363a20ee8e9527e5fd76
parentdfda972285d25802a696ed4671fad515a23c2446
[MERGE] Upstream

bzr revid: stw@openerp.com-20120417083821-91wc900kh617wz44