[MERGE] with trunk
authorForam Katharotiya (OpenERP) <fka@tinyerp.com>
Tue, 18 Jun 2013 04:56:06 +0000 (10:26 +0530)
committerForam Katharotiya (OpenERP) <fka@tinyerp.com>
Tue, 18 Jun 2013 04:56:06 +0000 (10:26 +0530)
commit2eb10d590591bbd9c427dede87cbe5c63e6a1969
tree36fe2fdb53d7a6b0ca5955218ddb6ff38f4677e0
parent4a9e4fcc9cc955a2ff29acd30acfdbf72d5715a4
parent6dd7120e1077b9ef2455a8051a59e1f8e40a79e7
[MERGE] with trunk

bzr revid: fka@tinyerp.com-20130618045606-58t0zqdo0ei6as19