merge_mit
authorFabien Pinckaers <fp@openerp.com>
Fri, 13 Jul 2012 20:38:00 +0000 (22:38 +0200)
committerFabien Pinckaers <fp@openerp.com>
Fri, 13 Jul 2012 20:38:00 +0000 (22:38 +0200)
bzr revid: fp@openerp.com-20120713203800-cyqmtjn2q2g05gcx


Trivial merge