merge
authorFabien Pinckaers <fp@tinyerp.com>
Wed, 9 Dec 2009 11:30:34 +0000 (12:30 +0100)
committerFabien Pinckaers <fp@tinyerp.com>
Wed, 9 Dec 2009 11:30:34 +0000 (12:30 +0100)
commitb4ba5ed39e184750b529fe5c7c7899d09b1b6fa8
tree9329a85418da0dc3a1a773035aeac397528b56a2
parenta2b058e89e312c9f1b3c8dbce82bc18a05bb1aed
parent23abfa1850752b35542b758dc49dc85eb0633376
merge

bzr revid: fp@tinyerp.com-20091209113034-jgxubfa8qcbamj4o
bin/addons/base/ir/ir.xml
bin/addons/base/res/res_company.py