[MERGE] Merged with addons/trunk.
authorThibault Delavallée <tde@openerp.com>
Fri, 20 Jul 2012 08:20:47 +0000 (10:20 +0200)
committerThibault Delavallée <tde@openerp.com>
Fri, 20 Jul 2012 08:20:47 +0000 (10:20 +0200)
commit4488c359d95b57cc4cee94344bfd1bfc7a73768d
tree3fdcf1409720db6cd82dee42a5f46113772cfce7
parent642fc05be5f47afebad5ddac7003c569d47fc881
parent7eb49260d163fb6a79e25208f24339cf0933dc3d
[MERGE] Merged with addons/trunk.

bzr revid: tde@openerp.com-20120720082047-5i1r9sslqqh0a9s8