[MERGE]
authorBhumika (OpenERP) <sbh@tinyerp.com>
Fri, 1 Apr 2011 12:44:42 +0000 (18:14 +0530)
committerBhumika (OpenERP) <sbh@tinyerp.com>
Fri, 1 Apr 2011 12:44:42 +0000 (18:14 +0530)
commita6fae8f8b5b1fb8dfd6b1ffb98edfa2e01688d09
tree388c2ee2c3ab701e896aa17e0999be495edd0848
parent21894625fd0ab8f5cf8e49a74afe28ba84f1f8e1
parent61934c61dcacfce98663e94c1b80cc95baefd0cb
[MERGE]

bzr revid: sbh@tinyerp.com-20110401124442-lkk0k13pka55wdib