[MERGE]
authoruco (OpenERP) <uco@tinyerp.com>
Mon, 13 Dec 2010 07:50:20 +0000 (13:20 +0530)
committeruco (OpenERP) <uco@tinyerp.com>
Mon, 13 Dec 2010 07:50:20 +0000 (13:20 +0530)
bzr revid: uco@tinyerp.com-20101213075020-38ys21591v35kr2p


Trivial merge