merge ach branch issue 16889
authorHusen Daudi <hda@hda-laptop>
Wed, 7 Sep 2011 06:31:13 +0000 (12:01 +0530)
committerHusen Daudi <hda@hda-laptop>
Wed, 7 Sep 2011 06:31:13 +0000 (12:01 +0530)
bzr revid: hda@hda-laptop-20110907063113-j1bmeip04tbdnzsm

1  2 
bin/osv/orm.py

diff --cc bin/osv/orm.py
Simple merge