[MERGE] merge from dev3
authorARA (OpenERP) <ara@tinyerp.com>
Mon, 31 Jan 2011 05:12:15 +0000 (10:42 +0530)
committerARA (OpenERP) <ara@tinyerp.com>
Mon, 31 Jan 2011 05:12:15 +0000 (10:42 +0530)
commit57b8780e54683d56384eca4b80afe96060cee7df
treea23ed0c6159599a6e4f5c54bfde89be56f663b6c
parent5438979397584b60c19e9aee2cc58fe449fd85cc
parent67415ffd26042e5d16f55817e89e6fb1bcd878bc
[MERGE] merge from dev3

bzr revid: ara@tinyerp.com-20110128092144-i4hcragzed56jbz4
bzr revid: ara@tinyerp.com-20110131051215-vwjizssymhg88g6h