[MERGE] Merged from Parent branch
authorJay Vora (OpenERP) <jvo@tinyerp.com>
Mon, 25 Jul 2011 09:55:45 +0000 (15:25 +0530)
committerJay Vora (OpenERP) <jvo@tinyerp.com>
Mon, 25 Jul 2011 09:55:45 +0000 (15:25 +0530)
commite7ee02406f4a9f3fb70d1963c0e02b1bd66ce874
tree83826150891d735379a5915e48ba304d9ba1fe84
parent536ad5cda697b4390d9d2ef9285b38e663ef6e7b
parentf3d18128f301d7abfe71a4c59e85cedf60807e3a
[MERGE] Merged from Parent branch

bzr revid: jvo@tinyerp.com-20110725095545-1b50dp25qfllwia6