Merged latest.
authorTejas Tank <tta@openerp.com>
Fri, 1 Feb 2013 06:49:32 +0000 (12:19 +0530)
committerTejas Tank <tta@openerp.com>
Fri, 1 Feb 2013 06:49:32 +0000 (12:19 +0530)
bzr revid: tta@openerp.com-20130201064932-b1eqi14w0x46976w


Trivial merge