[MERGE] trunk
authorJigar Amin - OpenERP <jam@tinyerp.com>
Tue, 26 Jun 2012 09:15:37 +0000 (14:45 +0530)
committerJigar Amin - OpenERP <jam@tinyerp.com>
Tue, 26 Jun 2012 09:15:37 +0000 (14:45 +0530)
commit28074752f656aea255ceeafc8562398bf5f3ddb2
tree6404afc5a49928fa66411183e5e7f3fc8b48cddd
parent4a99675e58a39e95abe2dcda8ae2ed4bfac68a45
parent5e764699c3ac402b8be1e3ae7d075dac8f7c1e7d
[MERGE] trunk

bzr revid: jam@tinyerp.com-20120626091537-yzqhiwa7fc3rhqnd