[MERGE]
authorOlivier Laurent <olt@tinyerp.com>
Thu, 9 Jul 2009 08:39:13 +0000 (10:39 +0200)
committerOlivier Laurent <olt@tinyerp.com>
Thu, 9 Jul 2009 08:39:13 +0000 (10:39 +0200)
bzr revid: olt@tinyerp.com-20090709083913-0jkpicud1kdq01um

1  2 
bin/service/web_services.py

Simple merge