[MERGE] Merged from the main trunk server branch.
authorAnup (OpenERP) <ach@tinyerp.com>
Thu, 20 May 2010 05:07:27 +0000 (10:37 +0530)
committerAnup (OpenERP) <ach@tinyerp.com>
Thu, 20 May 2010 05:07:27 +0000 (10:37 +0530)
commit67277f6f3dd5978501a2343e73e145adcdc5a5aa
tree783c02d7042b4de3b7f4cb9f5bff5c31a75ee6e9
parent94b0ad26df4e0c4a067b89cdc4a481be12a22bf0
parenta527812316d86a30149b3d42ce2ecfe8b31cd8a6
[MERGE] Merged from the main trunk server branch.

bzr revid: ach@tinyerp.com-20100520050727-zdkp6mp65kmfm66o
bin/addons/base/res/partner/partner_demo.xml
bin/netsvc.py
bin/osv/orm.py
bin/tools/config.py
bin/tools/convert.py
bin/tools/misc.py
setup.py