[MERGE] latest trunk
authorOlivier Dony <odo@openerp.com>
Mon, 12 Sep 2011 12:22:17 +0000 (14:22 +0200)
committerOlivier Dony <odo@openerp.com>
Mon, 12 Sep 2011 12:22:17 +0000 (14:22 +0200)
bzr revid: odo@openerp.com-20110912122217-a3fy0gmxbu18kemr

1  2 
openerp/addons/base/rng/view.rng

Simple merge