[MERGE]
authorAmit Patel (OpenERP) <apa@tinyerp.com>
Fri, 27 Apr 2012 05:08:37 +0000 (10:38 +0530)
committerAmit Patel (OpenERP) <apa@tinyerp.com>
Fri, 27 Apr 2012 05:08:37 +0000 (10:38 +0530)
commit2ed2fbe32e41973fec2aa3dcd2ebb53a319ac5dc
tree3095b452c5c48ee27c3b3566832b3708425a9a19
parent289ced9cc86c15b11639fc3eef727ec3f5b086f8
parent8d240b5775da32dc41bb0d9b5fc7255d1b49ea78
[MERGE]

bzr revid: apa@tinyerp.com-20120427050837-1rdfpnkt1q7pstaj