[MERGE] Merged with addons/trunk.
authorThibault Delavallée <tde@openerp.com>
Tue, 17 Jul 2012 07:58:45 +0000 (09:58 +0200)
committerThibault Delavallée <tde@openerp.com>
Tue, 17 Jul 2012 07:58:45 +0000 (09:58 +0200)
commit6135e52cfcdce2054cf01e2ac4ff1b34c0d6b9f1
tree449927e9dd054562a04dde1ce8be19202a1ae48c
parentc773bf396e4fbf2176191e9fccbee6809308c009
parent6c524cf107025999740788718fea82b5722b470b
[MERGE] Merged with addons/trunk.

bzr revid: tde@openerp.com-20120717075845-wpdcsvxywunqju5b