[MERGE]
authorpap (openerp) <pap@tinyerp.co.in>
Tue, 13 Jul 2010 13:38:56 +0000 (19:08 +0530)
committerpap (openerp) <pap@tinyerp.co.in>
Tue, 13 Jul 2010 13:38:56 +0000 (19:08 +0530)
bzr revid: pap@tinyerp.co.in-20100713133856-7k7s13cg1kjitins


Trivial merge