[MERGE]:merged with parent
authorAmit Patel (OpenERP) <apa@tinyerp.com>
Fri, 20 Jul 2012 06:05:23 +0000 (11:35 +0530)
committerAmit Patel (OpenERP) <apa@tinyerp.com>
Fri, 20 Jul 2012 06:05:23 +0000 (11:35 +0530)
commit063bed66180af61609e4af989292f1aed0648907
tree08925fcb745d3885fd7368cc6782bce0603ccdb8
parent84985583b9e8b87bf45ebeb7107110293709fa34
parent50ea0bdacddaa3d6c8d30f24a8b8795bf21ae1d6
[MERGE]:merged with parent

bzr revid: apa@tinyerp.com-20120720060523-0t9dudh79qw1h3e8