[MERGE]:from trunk server
authornch@tinyerp.com <>
Wed, 7 Jul 2010 11:05:43 +0000 (16:35 +0530)
committernch@tinyerp.com <>
Wed, 7 Jul 2010 11:05:43 +0000 (16:35 +0530)
commit2435cfe902f6f5c67a0e86d595024d6410777adf
tree84215260b7d37f645a05121a6317a3d2f8dac44f
parent3d0dc6bcd6f40f4cac76ff8595c51c623947d895
parent15008bf34bda3d8e2a09b7879d7f9e9dc51b4691
[MERGE]:from trunk server

bzr revid: nch@tinyerp.com-20100707110543-ayczu9j7ris3iby3
bin/addons/base/ir/ir_filters.py
bin/addons/base/ir/ir_ui_menu.py