Merged with latest.
authorTejas Tank <tta@openerp.com>
Thu, 1 Nov 2012 07:09:37 +0000 (12:39 +0530)
committerTejas Tank <tta@openerp.com>
Thu, 1 Nov 2012 07:09:37 +0000 (12:39 +0530)
bzr revid: tta@openerp.com-20121101070937-7axefsj8o0bdsu26


Trivial merge