[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)
commit631e354bf5d7430644017574cb68b415c0766d1e
tree7a77b6cd711bf2b415674b225927c059fb67d5dd
parente407ad1b0406c96b66d7868dd227cabc85a6d74d
parentdf77cd160ee1a52f162a6c1c84aa0d5203e545e1
[MERGE]: Merged with team1.

bzr revid: uco@tinyerp.com-20101124054038-00t8pgrkl5025qq5
bzr revid: uco@tinyerp.com-20101125051100-glxezb9l8bggwkda