[MERGE] with trunk-dev-addons1
authorjam-openerp <jam@tinyerp.com>
Fri, 4 Feb 2011 07:45:07 +0000 (13:15 +0530)
committerjam-openerp <jam@tinyerp.com>
Fri, 4 Feb 2011 07:45:07 +0000 (13:15 +0530)
bzr revid: jam@tinyerp.com-20110204074507-cd2kv0w1cwtdo444


Trivial merge