[MERGE] merge with trunk
authorAntoine Huvelle <ahu@openerp.com>
Wed, 23 Nov 2011 12:45:16 +0000 (13:45 +0100)
committerAntoine Huvelle <ahu@openerp.com>
Wed, 23 Nov 2011 12:45:16 +0000 (13:45 +0100)
bzr revid: ahu@openerp.com-20111123124516-f7e2u166phuzqw9r

1  2 
addons/web/static/src/css/base.css
addons/web/static/src/xml/base.xml

Simple merge
Simple merge