[MERGE]
authorAmit Patel (OpenERP) <apa@tinyerp.com>
Fri, 20 Jul 2012 08:30:00 +0000 (14:00 +0530)
committerAmit Patel (OpenERP) <apa@tinyerp.com>
Fri, 20 Jul 2012 08:30:00 +0000 (14:00 +0530)
commita7a91a7308a52c5f97f3079272ac519231c216c0
tree02155cffd65abc02b720fdbc7d82a5b745f5d9bd
parent3fb58139a4d61741bfe98544e226a20e4689069a
parent7eb49260d163fb6a79e25208f24339cf0933dc3d
[MERGE]

bzr revid: apa@tinyerp.com-20120720083000-pzf6udwq54jnvphz