[MERGE] merged cleaned warnings (appearing in the install logs).
authorVo Minh Thu <vmt@openerp.com>
Wed, 7 Dec 2011 16:11:40 +0000 (17:11 +0100)
committerVo Minh Thu <vmt@openerp.com>
Wed, 7 Dec 2011 16:11:40 +0000 (17:11 +0100)
bzr revid: vmt@openerp.com-20111207161140-4ams7da4t5l5n54u

1  2 
addons/account/account.py
addons/users_ldap/__openerp__.py

Simple merge
Simple merge