[MERGE] lp:~openerp-dev/openobject-server/trunk-sloppy-rng-jam-remove-type-tch
authorJigar Amin - OpenERP <jam@tinyerp.com>
Wed, 8 Aug 2012 11:13:34 +0000 (16:43 +0530)
committerJigar Amin - OpenERP <jam@tinyerp.com>
Wed, 8 Aug 2012 11:13:34 +0000 (16:43 +0530)
bzr revid: jam@tinyerp.com-20120808111334-cj5myswezirb7dh6


Trivial merge