[MERGE]Mergw with Trunk
authorPooja Zankhariya (OpenERP) <pza@tinyerp.com>
Fri, 10 Jan 2014 05:46:31 +0000 (10:46 +0500)
committerPooja Zankhariya (OpenERP) <pza@tinyerp.com>
Fri, 10 Jan 2014 05:46:31 +0000 (10:46 +0500)
bzr revid: pza@tinyerp.com-20131226055518-pl2wp3medwd55d14
bzr revid: pza@tinyerp.com-20131230052417-iqe74dvbj3ozhtp1
bzr revid: pza@tinyerp.com-20140110054631-564ljohag0nsgfv2


Trivial merge