[MERGE]: Merged with parent branch
authoruco (OpenERP) <uco@tinyerp.co.in>
Wed, 30 Dec 2009 05:23:15 +0000 (10:53 +0530)
committeruco (OpenERP) <uco@tinyerp.co.in>
Wed, 30 Dec 2009 05:23:15 +0000 (10:53 +0530)
bzr revid: uco@tinyerp.co.in-20091230052315-9sgj4cah5577hqpr


Trivial merge