[MERGE] latest trunk
authorAntonin Bourguignon <abo@openerp.com>
Fri, 10 Aug 2012 15:40:07 +0000 (17:40 +0200)
committerAntonin Bourguignon <abo@openerp.com>
Fri, 10 Aug 2012 15:40:07 +0000 (17:40 +0200)
commitb032b662c065fbad0fe0a535f652f54011c62ad5
tree155e58cae84707b31ed6f190f87a761b6c47113a
parent8686ddaa29bb83e520c01e4185e765a1bdaff660
parentb0abe3a5955fb5a59c173c5d50bffb0c5711db5d
[MERGE] latest trunk

bzr revid: abo@openerp.com-20120810154007-n5x8zxxlxw5mw6c8