merge
authorsbh (Open ERP) <sbh@tinyerp.com>
Mon, 1 Feb 2010 05:08:27 +0000 (10:38 +0530)
committersbh (Open ERP) <sbh@tinyerp.com>
Mon, 1 Feb 2010 05:08:27 +0000 (10:38 +0530)
commit8c0a4d3cb81a7bc1226956d683e92ec5cfc0b4fe
treef411f2cb62991bde4beb0862a94b93934e76c219
parent88e67767dd7490d98fcf28323550eb69b814c1d9
parent8d466990b0de0e5d5f1c220934883cf41df0c842
merge

bzr revid: uco@tinyerp.co.in-20100129130359-i2sk7iqpp21gy70o
bzr revid: sbh@tinyerp.com-20100201050827-sso64l1b6g2ry3yn