[MERGE]
authorThibault Francois <tfr@openerp.com>
Thu, 28 Oct 2010 09:13:41 +0000 (11:13 +0200)
committerThibault Francois <tfr@openerp.com>
Thu, 28 Oct 2010 09:13:41 +0000 (11:13 +0200)
commit950987e2fb179a913b3701754c7da0fe5e168151
tree684ff07a3a30167dd6754c74cd81c9e10e171013
parent743501fe1153c72b2155e47428576fe2d64f9d7d
parent65d1777b65c6ade6ef69ecb82ff389a5b1e1e2cf
[MERGE]

bzr revid: tfr@openerp.com-20101028091341-nryekjn92gck386s