[MERGE]: Merge with lp:~openerp-dev/openobject-addons/ron-dev-addons2
authorRucha (Open ERP) <rpa@tinyerp.com>
Tue, 8 Feb 2011 12:16:55 +0000 (17:46 +0530)
committerRucha (Open ERP) <rpa@tinyerp.com>
Tue, 8 Feb 2011 12:16:55 +0000 (17:46 +0530)
commit7cdc4ced425eb3100bdbe2c5362e8dd9c4e7bf81
tree0b2154032d89bc718740984496c9099a5809c6ec
parentf6ac1c8b3a847f58347a3be5c9c257ba82bcf6df
parentd92c83d632dfb50fc210f7e0495eaf51783070b0
[MERGE]: Merge with lp:~openerp-dev/openobject-addons/ron-dev-addons2

bzr revid: rpa@tinyerp.com-20110208121655-nthsxtqq9z3qd0w0