[MERGE]
authorThibault Francois <tfr@openerp.com>
Thu, 23 Dec 2010 08:57:31 +0000 (09:57 +0100)
committerThibault Francois <tfr@openerp.com>
Thu, 23 Dec 2010 08:57:31 +0000 (09:57 +0100)
commit3b590c4e01cc18e04f193571b9c963b4ec15ccee
treeb01ab000fac4788e194f008ae2f97b0a9ae0f723
parentdc35394ec3f2c9f53d7fc1f10329eb96e5f3a4db
parent3ce82d313362a245fcb13b7db7142608944bc2e3
[MERGE]

bzr revid: tfr@openerp.com-20101223085731-zxz3s1gpd62inndb