[MERGE] Merged with addons/trunk.
authorThibault Delavallée <tde@openerp.com>
Tue, 14 Aug 2012 19:44:49 +0000 (21:44 +0200)
committerThibault Delavallée <tde@openerp.com>
Tue, 14 Aug 2012 19:44:49 +0000 (21:44 +0200)
commit9056c6dfe837dc756d7f84514f32e238478a0559
tree77920621f07c50d4df65e456df10db0780c2ba55
parent87f657f9efbd013b840b51d19efb66cc8c06eb8a
parent7fa1111d0a07bdae58507d12163ec6cb965badab
[MERGE] Merged with addons/trunk.

bzr revid: tde@openerp.com-20120814194449-lbgwttiax09fhvj6