[MERGE]
authorHDA (OpenERP) <hda@tinyerp.com>
Thu, 1 Oct 2009 13:42:05 +0000 (19:12 +0530)
committerHDA (OpenERP) <hda@tinyerp.com>
Thu, 1 Oct 2009 13:42:05 +0000 (19:12 +0530)
commit0bd2091336660066f9823a37c441c5ffb4c1b098
tree88afbb753ed50671b565fa967db523ca0faac976
parenteefe57c93ec8705cbdaa1d510c2df5024d3f0b41
parent2ffd03d944efadf8b17a075a0842e456f1b94fe7
[MERGE]

bzr revid: hda@tinyerp.com-20091001134205-o0ux35wcyahwz4cp