[MERGE] evalpocalypse
authorXavier Morel <xmo@openerp.com>
Thu, 29 Nov 2012 09:11:49 +0000 (10:11 +0100)
committerXavier Morel <xmo@openerp.com>
Thu, 29 Nov 2012 09:11:49 +0000 (10:11 +0100)
bzr revid: xmo@openerp.com-20121129091149-0k26u2mmjzaa2c1a


Trivial merge