[MERGE] with trunk
authorForam Katharotiya (OpenERP) <fka@tinyerp.com>
Tue, 16 Apr 2013 04:49:00 +0000 (10:19 +0530)
committerForam Katharotiya (OpenERP) <fka@tinyerp.com>
Tue, 16 Apr 2013 04:49:00 +0000 (10:19 +0530)
bzr revid: fka@tinyerp.com-20130415045553-2pjczc1ul80k9v3v
bzr revid: fka@tinyerp.com-20130416044900-uk3rzd4rb1d7i5je


Trivial merge