merge
authorFabien Pinckaers <fp@tinyerp.com>
Mon, 27 Oct 2008 20:31:42 +0000 (21:31 +0100)
committerFabien Pinckaers <fp@tinyerp.com>
Mon, 27 Oct 2008 20:31:42 +0000 (21:31 +0100)
commit33269606bd1e30160a3a004979dcc19ee516ddf6
tree1fc4f6a7d00fe92932c6d5aff18cb73aab7a1ae9
parentd54616572e8d9c4c593d8c046404d0663981d7fc
merge

bzr revid: fp@tinyerp.com-20081027203142-cdqgk11kigopue52
addons/mrp/mrp.py
addons/mrp/mrp_view.xml