[MERGE] Merge with trunk server.
authorYogesh (OpenERP) <ysa@tinyerp.com>
Thu, 11 Aug 2011 11:05:15 +0000 (16:35 +0530)
committerYogesh (OpenERP) <ysa@tinyerp.com>
Thu, 11 Aug 2011 11:05:15 +0000 (16:35 +0530)
commita54a00ea62ab5813069e32678b9c6c3a3790145d
tree183c2f22cdbfc7bd663ffec466ecd652e16be21d
parent84c2c44ec3f388f3f10953acf6c1457f639f9804
parent72260467071aa9e0340fa3d2d961ecb2e90a8d0d
[MERGE] Merge with trunk server.

bzr revid: ysa@tinyerp.com-20110808044657-wdrsjtatkn0745zf
bzr revid: ysa@tinyerp.com-20110811110515-xnyrr12apnl2nphf
openerp/addons/base/ir/ir_ui_view.py