[MERGE] sync with latest trunk
authorOlivier Dony <odo@openerp.com>
Wed, 28 Sep 2011 21:13:26 +0000 (23:13 +0200)
committerOlivier Dony <odo@openerp.com>
Wed, 28 Sep 2011 21:13:26 +0000 (23:13 +0200)
commite7601e68cb702f08c76cad726b6ae42d741ed9cc
tree7d8bb0714649cb5b4d6cc61243c6dedbd21ec95e
parente93d018a394ed09c1e8420052b24c5c6c15dd568
parent762637518b636bb95aefd078ac0fd91d6cba373c
[MERGE] sync with latest trunk

bzr revid: odo@openerp.com-20110928211326-0e51q7zlw4h2528z
openerp-server
openerp/addons/base/__openerp__.py
openerp/addons/base/test/test_ir_cron.yml
openerp/conf/__init__.py
openerp/modules/registry.py
openerp/netsvc.py
openerp/service/__init__.py
openerp/service/web_services.py
openerp/sql_db.py
openerp/tools/config.py