[merge]: merging with the same branch
authorRavi Gohil (Open ERP) <rgo@tinyerp.com>
Tue, 7 Jun 2011 13:15:08 +0000 (18:45 +0530)
committerRavi Gohil (Open ERP) <rgo@tinyerp.com>
Tue, 7 Jun 2011 13:15:08 +0000 (18:45 +0530)
commit663b5199cd7305c31530342bfd606e6dee7ceea0
treedb49b9e6e5af0b15f92a82d84d607b13b2ef5e0e
parent74b9c6aa19c0874a08e8d9b27e70e2aec4347056
parent0b4bb20a03a6b75a5b98213e938fae8d70293390
[merge]: merging with the same branch

bzr revid: rgo@tinyerp.com-20110607131508-d8c2qtwj02g7qc7w