[MERGE] Sync with trunk.
authorThibault Delavallée <tde@openerp.com>
Mon, 10 Dec 2012 12:54:18 +0000 (13:54 +0100)
committerThibault Delavallée <tde@openerp.com>
Mon, 10 Dec 2012 12:54:18 +0000 (13:54 +0100)
commit3446b3587465c956e3698d8ee4579cdd3305ffea
tree4479603a9c21e76194a5c83d59a984245475072d
parent003752f7f1545b75e254e1585943bdfe1bb74de5
parent798e44b1e4deb2730a94b616f3964fe98c6f66b8
[MERGE] Sync with trunk.

bzr revid: tde@openerp.com-20121210125418-l8ntl5o5mnb2dq3h
openerp/addons/base/ir/ir_ui_menu.py