merge trunk
authorniv-openerp <nicolas.vanhoren@openerp.com>
Mon, 4 Jun 2012 08:55:01 +0000 (10:55 +0200)
committerniv-openerp <nicolas.vanhoren@openerp.com>
Mon, 4 Jun 2012 08:55:01 +0000 (10:55 +0200)
commit3ee7745d1f51f8733380049aaf753c2b49008471
treee4efe9a1958ae56cfb65e15dd561956174bb1e88
parent35962e14c76ae611e769e0418dcb86a40cde2cd9
parent37e59e65b393034b4cc3fe79521be9525b650960
merge trunk

bzr revid: nicolas.vanhoren@openerp.com-20120604085501-vqo9w3rwkcxyw3bw