[MERGE]
authoruco (OpenERP) <uco@tinyerp.com>
Thu, 30 Dec 2010 06:17:10 +0000 (11:47 +0530)
committeruco (OpenERP) <uco@tinyerp.com>
Thu, 30 Dec 2010 06:17:10 +0000 (11:47 +0530)
commit04bdf48d79ad5499c0b1b5616191b3f60998ff11
tree419cca845f097bafd1f482ebff654b030366d6a6
parente0416f8a8fb82174fdaafdbf4bb6dfced55a2b04
parent8197975a4a97043530a68aef45f0b9c62803a7cf
[MERGE]

bzr revid: uco@tinyerp.com-20101230061710-k1p6vyynj7u9grbx