[MERGE] merge from dev3
authorARA (OpenERP) <ara@tinyerp.com>
Wed, 12 Jan 2011 09:11:00 +0000 (14:41 +0530)
committerARA (OpenERP) <ara@tinyerp.com>
Wed, 12 Jan 2011 09:11:00 +0000 (14:41 +0530)
commitf55f89d292f0841931e99ccadd84102517263d68
tree218e601b36c76bfe642782f6eb5fc9c6c2b01e19
parentc18164657898404e90df0335fd72fe8935f5cca3
parenteeaba5d416b3f3e46dd2e96f07a52cb6768702cc
[MERGE] merge from dev3

bzr revid: ara@tinyerp.com-20110112091100-ck94hoc9kzrle37c