[MERGE]
authorStephane Wirtel <stephane@openerp.com>
Tue, 30 Mar 2010 16:41:00 +0000 (18:41 +0200)
committerStephane Wirtel <stephane@openerp.com>
Tue, 30 Mar 2010 16:41:00 +0000 (18:41 +0200)
commit0f51cf639b4970e0636fc79c0213faf749e75d00
treedc077861e7883d25df2d319906e88d16a4e7037b
parentef881c2c254bcf709aa43f6cbb3d828b3b61af5f
parentb6c304baf43c02345914e84f94f9d94d8b03f8df
[MERGE]

bzr revid: stephane@openerp.com-20100330164100-b939l3qnx9syqffk