[MERGE] latest trunk (and again and again and again and again...)
authorAntonin Bourguignon <abo@openerp.com>
Tue, 14 Aug 2012 15:27:14 +0000 (17:27 +0200)
committerAntonin Bourguignon <abo@openerp.com>
Tue, 14 Aug 2012 15:27:14 +0000 (17:27 +0200)
commit8d705b3a4bb8b6c2fb3af13b051801512638330e
treef84dcf89df158826a24a2aa48391ed7d40ffc8ab
parent97bdebbfce0876e763d9bd56dfb308cece0765e8
parentcaa053c252d29a31bf7f4300d7b47860fdba9f1e
[MERGE] latest trunk (and again and again and again and again...)

bzr revid: abo@openerp.com-20120814152714-kql81gjivwtv6mz0