[MEGRE] Merged lp:openobject-addons
authorJigar Amin - OpenERP <jam@tinyerp.com>
Tue, 29 Nov 2011 04:18:07 +0000 (09:48 +0530)
committerJigar Amin - OpenERP <jam@tinyerp.com>
Tue, 29 Nov 2011 04:18:07 +0000 (09:48 +0530)
bzr revid: jam@tinyerp.com-20111129041807-zqvf7q8ur9czc2lc


Trivial merge