[MERGE] Merged with addons/trunk.

bzr revid: tde@openerp.com-20120815182906-irmi67sqm0gdsnmy
This commit is contained in:
Thibault Delavallée
2012-08-15 20:29:06 +02:00
File diff suppressed because it is too large Load Diff