merge
authorFabien Pinckaers <fp@tinyerp.com>
Wed, 10 Sep 2008 09:35:22 +0000 (11:35 +0200)
committerFabien Pinckaers <fp@tinyerp.com>
Wed, 10 Sep 2008 09:35:22 +0000 (11:35 +0200)
bzr revid: fp@tinyerp.com-20080910093522-wf3egrb2u2etlb5p

1  2 
addons/mrp/mrp_view.xml

Simple merge