[MRG] merge with main branch
authorTurkesh Patel (Open ERP) <tpa@tinyerp.com>
Mon, 14 May 2012 05:44:06 +0000 (11:14 +0530)
committerTurkesh Patel (Open ERP) <tpa@tinyerp.com>
Mon, 14 May 2012 05:44:06 +0000 (11:14 +0530)
commit9f5e09b1beea71954cc33d7640353f85fca51214
tree5eb2bdcce6a6d253ecc4029e6028a438c35bbefe
parent19da90f3d33ebd4e0f0b04e1558e60ea8dd44407
parent420e45e1394c3e7a537de493802c0eb1c39f9200
[MRG] merge with main branch

bzr revid: tpa@tinyerp.com-20120514054406-e6bb0uuy6kmj925k