[MERGE] Sync with trunk, because conflicting with ir_ui_menu lastly udpated.
authorThibault Delavallée <tde@openerp.com>
Mon, 10 Dec 2012 13:22:04 +0000 (14:22 +0100)
committerThibault Delavallée <tde@openerp.com>
Mon, 10 Dec 2012 13:22:04 +0000 (14:22 +0100)
commit733cb0d96aac3e11cdc722d5249ae41d5c9c81a0
treece28ef2fc84d9e42ccc2e9570ecfe82d0c5b2fb7
parentf0abd6f49e4679ef82ab22cb0dc4e994feb3ce10
parentb0c9f525ce62c8bd74409e3f82152cd970f14ea5
[MERGE] Sync with trunk, because conflicting with ir_ui_menu lastly udpated.

bzr revid: tde@openerp.com-20121210132204-39p7chispvogelux