merge trunk
authorniv-openerp <nicolas.vanhoren@openerp.com>
Wed, 30 May 2012 12:57:50 +0000 (14:57 +0200)
committerniv-openerp <nicolas.vanhoren@openerp.com>
Wed, 30 May 2012 12:57:50 +0000 (14:57 +0200)
commit4031e29720f2170dc2a9a0da4edb322b67c2b4a2
tree0dbe8f5ab3fc837c511313f9ee5cb259db465c8a
parentbdea8fde06f6966f8c97fb4a1813d57838a6b9af
parentbedf81f2da5b92bd1b189419cb7168ed83e06e7e
merge trunk

bzr revid: nicolas.vanhoren@openerp.com-20120530125750-snapic7oylvcojv7