[MERGE]: Merged with team1.
authoruco (OpenERP) <uco@tinyerp.com>
Thu, 25 Nov 2010 05:11:00 +0000 (10:41 +0530)
committeruco (OpenERP) <uco@tinyerp.com>
Thu, 25 Nov 2010 05:11:00 +0000 (10:41 +0530)
bzr revid: uco@tinyerp.com-20101124054038-00t8pgrkl5025qq5
bzr revid: uco@tinyerp.com-20101125051100-glxezb9l8bggwkda


Trivial merge