[MERGE]: Merged with team1.
authoruco (OpenERP) <uco@tinyerp.com>
Wed, 10 Nov 2010 12:47:27 +0000 (18:17 +0530)
committeruco (OpenERP) <uco@tinyerp.com>
Wed, 10 Nov 2010 12:47:27 +0000 (18:17 +0530)
bzr revid: uco@tinyerp.com-20101110124727-2zx4l0pfg5s4wi6h


Trivial merge