[MERGE] from trunk
authorFrédéric van der Essen <fva@openerp.com>
Wed, 21 Nov 2012 16:58:51 +0000 (17:58 +0100)
committerFrédéric van der Essen <fva@openerp.com>
Wed, 21 Nov 2012 16:58:51 +0000 (17:58 +0100)
commita7751a5af2bbc3662d7dbd8f876d7003a0710249
treed2416cc84321b6cb4d1b4f673ad2b17eed8aa58f
parentb5ce5ee91b32479d2f938e4eb041ad4ea528ce3f
parentd61507a799b0fdf7fd9620226601bdc5372aa7d4
[MERGE] from trunk

bzr revid: fva@openerp.com-20121121165851-fl8qq97ufx1ya5lu