[MERGE]
authorThibault Francois <tfr@openerp.com>
Thu, 17 Mar 2011 14:20:09 +0000 (15:20 +0100)
committerThibault Francois <tfr@openerp.com>
Thu, 17 Mar 2011 14:20:09 +0000 (15:20 +0100)
commit30a28ead2fbdaaaf73d5f14201e80d8cb39a3d25
tree4241db3d71a21e715f07b514ef11f91e45010dde
parent26f3de4751a8e309fc1d93149bb64ae6d3244474
parentedbb2d71684200fc6400427090422cf7dbadc8d6
[MERGE]

bzr revid: tfr@openerp.com-20110317142009-9t4g0qodb2w1m8k8