[MRG] merge with lp:~openerp-dev/openobject-addons/trunk-red-button
authorTurkesh Patel (Open ERP) <tpa@tinyerp.com>
Thu, 14 Jun 2012 12:21:21 +0000 (17:51 +0530)
committerTurkesh Patel (Open ERP) <tpa@tinyerp.com>
Thu, 14 Jun 2012 12:21:21 +0000 (17:51 +0530)
bzr revid: tpa@tinyerp.com-20120614122121-8yojrf3l760bdrhc


Trivial merge