[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)
commit2d84daf21012fc9ed99dc48719a85d3c0af1c48c
tree75aa2142708b98b7b3d1fb58ccdafc475e74b460
parentea92099e3df707677b7bf8721e872b834bbea2af
parent7f7f00a52f2fb71185560a733b0ee0eea9e71c92
[MERGE] merge with trunk

bzr revid: ahu@openerp.com-20111123124516-f7e2u166phuzqw9r
addons/web/static/src/css/base.css
addons/web/static/src/xml/base.xml