[MERGE] Merged Tristan Hill (credativ)'s branch for the fix of bug lp:733799

bzr revid: jvo@tinyerp.com-20110515141848-34kuiher620d95zm
This commit is contained in:
Tristan Hill (credativ)
2011-05-15 19:48:48 +05:30
committed by Jay Vora (OpenERP)
@@ -1,3 +1,3 @@
"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
"access_ir_header_webkit","ir.header_webkit","model_ir_header_webkit",,,,,
"access_ir_header_webkit","ir.header_webkit","model_ir_header_webkit",,1,,,
"access_ir_header_img","ir.header_img","model_ir_header_img",,,,,
1 id name model_id:id group_id:id perm_read perm_write perm_create perm_unlink
2 access_ir_header_webkit ir.header_webkit model_ir_header_webkit 1
3 access_ir_header_img ir.header_img model_ir_header_img