Merged Latest.
authorTejas Tank <tta@openerp.com>
Fri, 7 Dec 2012 10:14:28 +0000 (15:14 +0500)
committerTejas Tank <tta@openerp.com>
Fri, 7 Dec 2012 10:14:28 +0000 (15:14 +0500)
bzr revid: tta@openerp.com-20121207101428-lhfadcamzazbb682


Trivial merge