[MERGE] evalpocalypse-related fixes
authorXavier Morel <xmo@openerp.com>
Thu, 29 Nov 2012 09:12:02 +0000 (10:12 +0100)
committerXavier Morel <xmo@openerp.com>
Thu, 29 Nov 2012 09:12:02 +0000 (10:12 +0100)
bzr revid: xmo@openerp.com-20121129091202-tibeevirun95o1mi


Trivial merge