[MERGE] Merge trunk
authorFabien Meghazi <fme@openerp.com>
Wed, 9 May 2012 07:46:54 +0000 (09:46 +0200)
committerFabien Meghazi <fme@openerp.com>
Wed, 9 May 2012 07:46:54 +0000 (09:46 +0200)
bzr revid: fme@openerp.com-20120509074654-bhig8jx2035uegby

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

Simple merge