[MERGE]
authorBhumika (OpenERP) <sbh@tinyerp.com>
Fri, 25 Mar 2011 04:58:06 +0000 (10:28 +0530)
committerBhumika (OpenERP) <sbh@tinyerp.com>
Fri, 25 Mar 2011 04:58:06 +0000 (10:28 +0530)
commit479f21f4fdad3a0c0f5cca63a525a42ee75a1e98
tree24299cd4059a687e0d6d1dd9839bd67b3f58adc5
parent8757b92bab8d61189c30b180c7ddf25a8eb2f0b9
parentdea0358cee4c9380c8b47a85d6d7d8884825580d
[MERGE]

bzr revid: sbh@tinyerp.com-20110325045806-2oqta2hmpuynn9iy