Merged Latest.
authorTejas Tank <tta@openerp.com>
Mon, 3 Dec 2012 05:22:09 +0000 (10:22 +0500)
committerTejas Tank <tta@openerp.com>
Mon, 3 Dec 2012 05:22:09 +0000 (10:22 +0500)
bzr revid: tta@openerp.com-20121203052209-cxcrp8nru1rvd6y1


Trivial merge