[MERGE] lp:~openerp-dev/openobject-addons/trunk-red-button-improve-tch
authorJigar Amin - OpenERP <jam@tinyerp.com>
Tue, 26 Jun 2012 09:07:02 +0000 (14:37 +0530)
committerJigar Amin - OpenERP <jam@tinyerp.com>
Tue, 26 Jun 2012 09:07:02 +0000 (14:37 +0530)
bzr revid: jam@tinyerp.com-20120626090702-fe1da3yae8z0hgw5


Trivial merge