[MERGE]merge with parent branch
authorSanjay Gohel (Open ERP) <sgo@tinyerp.com>
Mon, 7 May 2012 09:38:23 +0000 (15:08 +0530)
committerSanjay Gohel (Open ERP) <sgo@tinyerp.com>
Mon, 7 May 2012 09:38:23 +0000 (15:08 +0530)
commitc755053d13b6ecb1411c17d080e67704dc7eca8f
tree6fdfe2193fed13409d0857e87bca5825654e220a
parentc43e5dfe7e57e73d60d5e3ca2320ea52958726b2
parentc7742d6e96f2a0db5d37613ce5010cc075517957
[MERGE]merge with parent branch

bzr revid: sgo@tinyerp.com-20120507093823-d40xegyx7mko0xja