[MERGE] Merge with parent branch
authorForam Katharotiya (OpenERP) <fka@tinyerp.com>
Fri, 31 Aug 2012 10:35:21 +0000 (16:05 +0530)
committerForam Katharotiya (OpenERP) <fka@tinyerp.com>
Fri, 31 Aug 2012 10:35:21 +0000 (16:05 +0530)
bzr revid: fka@tinyerp.com-20120831103521-ydpkov2mvsg0um5g


Trivial merge