[MRG] merge with main addons
authorTurkesh Patel (Open ERP) <tpa@tinyerp.com>
Tue, 1 May 2012 10:21:17 +0000 (15:51 +0530)
committerTurkesh Patel (Open ERP) <tpa@tinyerp.com>
Tue, 1 May 2012 10:21:17 +0000 (15:51 +0530)
bzr revid: tpa@tinyerp.com-20120501102117-go0mrlhshd4s1fd7


Trivial merge