[MERGE] technical no-op merge to restore history
authorOlivier Dony <odo@openerp.com>
Wed, 26 Oct 2011 08:56:31 +0000 (10:56 +0200)
committerOlivier Dony <odo@openerp.com>
Wed, 26 Oct 2011 08:56:31 +0000 (10:56 +0200)
bzr revid: odo@openerp.com-20111026085631-qyrwgaocx0k531bl


Trivial merge