Merged Latest.
authorTejas Tank <tta@openerp.com>
Tue, 12 Mar 2013 05:00:31 +0000 (10:30 +0530)
committerTejas Tank <tta@openerp.com>
Tue, 12 Mar 2013 05:00:31 +0000 (10:30 +0530)
bzr revid: tta@openerp.com-20130312050031-r87g4ia4ajeacp6y


Trivial merge