pulled
authorTejas Tank <tta@openerp.com>
Tue, 12 Jun 2012 13:08:35 +0000 (18:38 +0530)
committerTejas Tank <tta@openerp.com>
Tue, 12 Jun 2012 13:08:35 +0000 (18:38 +0530)
bzr revid: tta@openerp.com-20120612130835-5ae47in00u8uz9dy


Trivial merge