[MERGE]
authorUjjvala Collins (OpenERP) <uco@tinyerp.com>
Tue, 8 Feb 2011 10:15:06 +0000 (15:45 +0530)
committerUjjvala Collins (OpenERP) <uco@tinyerp.com>
Tue, 8 Feb 2011 10:15:06 +0000 (15:45 +0530)
commit3a35938babd6be78a1dae839675716372debb24e
tree75756de49e7ff0abfdc52886f5687443ce8641ba
parentbffc8717832d2b15e7130bdf6ca816904250181b
parenta92107f50931cb16fc8cd150a7af72879a8cb9dc
[MERGE]

bzr revid: uco@tinyerp.com-20110208101506-y2l3wvt71re1hxcw