[MERGE] Merging
authorpso (OpenERP) <pso@tinyerp.com>
Tue, 4 Oct 2011 05:00:45 +0000 (10:30 +0530)
committerpso (OpenERP) <pso@tinyerp.com>
Tue, 4 Oct 2011 05:00:45 +0000 (10:30 +0530)
commitc1cbfc0c722834f69bd239a8f816e9dc865401a4
treefcdfefb867f9203578fab5da64922f4ca235022e
parent97f3645d16f7d5c5ef7baa58b685aa25797b3c19
parentcbe67217a9da7a0dcdabcc90012141254fc478b5
[MERGE] Merging

bzr revid: pso@tinyerp.com-20111004050045-3lfijes2to0m00pe