[MERGE] merge with latest trunk
authorRandhir Mayatra (OpenERP) <rma@tinyerp.com>
Fri, 31 May 2013 09:00:39 +0000 (14:30 +0530)
committerRandhir Mayatra (OpenERP) <rma@tinyerp.com>
Fri, 31 May 2013 09:00:39 +0000 (14:30 +0530)
bzr revid: rma@tinyerp.com-20130531090039-ar87vekp2kfcw1xs


Trivial merge