[MERGE]
authorThibault Francois <tfr@openerp.com>
Mon, 28 Feb 2011 17:23:48 +0000 (18:23 +0100)
committerThibault Francois <tfr@openerp.com>
Mon, 28 Feb 2011 17:23:48 +0000 (18:23 +0100)
commit61301f5baadd4c6f2576a0389484c56e5472f30f
tree49605c02e9a28cb141e72c1edeaa7c5eff296f5d
parent6ef20247f077116d1c6598e7ef77658afeb5eef1
parentfb544b4212d552739ed318be8f68db91e1f9e315
[MERGE]

bzr revid: tfr@openerp.com-20110228172348-k7hztdqn6by42708