merge
authorFabien Pinckaers <fp@openerp.com>
Tue, 14 Aug 2012 16:39:01 +0000 (18:39 +0200)
committerFabien Pinckaers <fp@openerp.com>
Tue, 14 Aug 2012 16:39:01 +0000 (18:39 +0200)
commitd6a6522c34cdfda143bb7c4952dd21f42b5ac6db
tree8242471953f86372d5179c32e02c9b6534f21402
parentc5dc5cef00cd596d6c0b6c9899bf1d8de16e9026
parent1885387ace913bd062cb1b86988b44707571878a
merge

bzr revid: fp@openerp.com-20120814163901-chassx588kktn17y