[MERGE] opw 17578
authorRaphael Collet <rco@openerp.com>
Mon, 17 Oct 2011 09:02:45 +0000 (11:02 +0200)
committerRaphael Collet <rco@openerp.com>
Mon, 17 Oct 2011 09:02:45 +0000 (11:02 +0200)
bzr revid: rco@openerp.com-20111017090245-lgrud8q2uo94tf41


Trivial merge