[MRG] merge with lp:~openerp-dev/openobject-addons/trunk-bug-998026-tpa
authorTurkesh Patel (Open ERP) <tpa@tinyerp.com>
Mon, 14 May 2012 05:53:39 +0000 (11:23 +0530)
committerTurkesh Patel (Open ERP) <tpa@tinyerp.com>
Mon, 14 May 2012 05:53:39 +0000 (11:23 +0530)
commita14062fbd9bcc95089e0821e1659a22ee8e555f4
treea62a21b7172b66001c3dff6529bbed92de0d9550
parent62d904a7c0ca22dfe02f4dd3912471f5c99ee5fa
parent9f5e09b1beea71954cc33d7640353f85fca51214
[MRG] merge with lp:~openerp-dev/openobject-addons/trunk-bug-998026-tpa

bzr revid: tpa@tinyerp.com-20120514055339-n9hp6qkdflkpljrj