[MERGE]
authorUjjvala Collins (OpenERP) <uco@tinyerp.com>
Mon, 31 Jan 2011 04:55:03 +0000 (10:25 +0530)
committerUjjvala Collins (OpenERP) <uco@tinyerp.com>
Mon, 31 Jan 2011 04:55:03 +0000 (10:25 +0530)
commit4edf341486baaa381b2106c39f68b531f5831f1b
treea4b0402877e8120ceea8cb6b86e18157e938f9fb
parent87ae3bb4ebfdebcb338fe1afa65a6cae5aa258d8
parent93e9857b3fc2b70c8a2d73cee027909e46ee22bc
[MERGE]

bzr revid: uco@tinyerp.com-20110131045503-41pyybdlk6ytl6sq