[MERGE] lp:openobject-addons
authorJigar Amin - OpenERP <jam@tinyerp.com>
Tue, 22 Nov 2011 06:09:58 +0000 (11:39 +0530)
committerJigar Amin - OpenERP <jam@tinyerp.com>
Tue, 22 Nov 2011 06:09:58 +0000 (11:39 +0530)
bzr revid: jam@tinyerp.com-20111122060958-q4ja25q4f1qkl3dg


Trivial merge