[MERGE] lp:~openerp-dev/openobject-addons/trunk-wiz-remove-btn-stock-tch
authorJigar Amin - OpenERP <jam@tinyerp.com>
Tue, 19 Jun 2012 08:32:19 +0000 (14:02 +0530)
committerJigar Amin - OpenERP <jam@tinyerp.com>
Tue, 19 Jun 2012 08:32:19 +0000 (14:02 +0530)
bzr revid: jam@tinyerp.com-20120619083219-ei2sbx4p0afxoix1


Trivial merge