[MERGE]: Merged with trunk-addons.
authorUjjvala Collins (OpenERP) <uco@tinyerp.com>
Mon, 21 Nov 2011 05:10:23 +0000 (10:40 +0530)
committerUjjvala Collins (OpenERP) <uco@tinyerp.com>
Mon, 21 Nov 2011 05:10:23 +0000 (10:40 +0530)
commit691b6dd01386e83dfa2d4394da5225ae73896973
treeb188781cd58d083b3e423f2803ec2773ef9361c5
parent5dae1c2cd6dd8fb428630262d7ed36bc400b512d
parent7dc7a3849087dbb525b227fc1ddb79c7020a92f3
[MERGE]: Merged with trunk-addons.

bzr revid: uco@tinyerp.com-20111121051023-cw7nzitr9ph1wh4h