[MERGE]:openerp/openobject-addons/trunk
authorKirti Savalia (OpenERP) <ksa@tinyerp.com>
Fri, 2 Sep 2011 05:02:02 +0000 (10:32 +0530)
committerKirti Savalia (OpenERP) <ksa@tinyerp.com>
Fri, 2 Sep 2011 05:02:02 +0000 (10:32 +0530)
commit4441964780c6b779f26a060f56ab06bbcc7515c4
tree338bb735ca7b9f66dc34f2121307c5007a42a1ed
parent2d83c96317f0609a2fe04e211f54bb0cb6f42a7a
parentdcb11c281e19e09762089011627c74231807c938
[MERGE]:openerp/openobject-addons/trunk

bzr revid: ksa@tinyerp.com-20110902050202-fh6v2e6pncik7ujf