[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)
commit106100eea03c973e3ccc322ee32354b3ccb18d1e
treeaec07787a07d0902781feecd5b14aac5c1744ae3
parent123816468061d03bc9139d6cc1cfb2846e7e28dd
parent1f26804726a709e30994c4d0be30f6b47704e874
[MERGE] evalpocalypse-related fixes

bzr revid: xmo@openerp.com-20121129091202-tibeevirun95o1mi