[MERGE] Merge import framework
authorBhumika (OpenERP) <sbh@tinyerp.com>
Wed, 1 Jun 2011 09:28:08 +0000 (14:58 +0530)
committerBhumika (OpenERP) <sbh@tinyerp.com>
Wed, 1 Jun 2011 09:28:08 +0000 (14:58 +0530)
commit7530ba40d561ca730947405fd2f9ebb39b70d3a2
treeb9f85dcdcbe426bddd16ba363d1a209e8698f682
parentb041c205ff4c8f39335a2b1afd5ece068d77ba50
parenta843faf44cc8fada36fb483de831569fb961d33f
[MERGE] Merge import framework

bzr revid: sbh@tinyerp.com-20110601092808-wkrbrh7b5rffxrme