[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)
bzr revid: fka@tinyerp.com-20130618045606-58t0zqdo0ei6as19


Trivial merge