[MERGE]Sync with Trunk
authorPooja Zankhariya (OpenERP) <pza@tinyerp.com>
Fri, 31 Jan 2014 06:50:44 +0000 (11:50 +0500)
committerPooja Zankhariya (OpenERP) <pza@tinyerp.com>
Fri, 31 Jan 2014 06:50:44 +0000 (11:50 +0500)
bzr revid: pza@tinyerp.com-20140131065044-sn70e45ax46h97w3


Trivial merge