[MERGE] from upstream
authorFrédéric van der Essen <fva@openerp.com>
Fri, 11 Jan 2013 14:47:13 +0000 (15:47 +0100)
committerFrédéric van der Essen <fva@openerp.com>
Fri, 11 Jan 2013 14:47:13 +0000 (15:47 +0100)
commit5eb4275d157ab0cb816a8f87e5467811293d6fcc
tree960397d7327579e5a1a12189d7a27920a8ab1ca0
parenta480cff6f5d6b0ec7c72410fff4c399ae73d14f8
parent04f75c1833a4becce07be854a8e676e9ae1fac5d
[MERGE] from upstream

bzr revid: fva@openerp.com-20130111144713-w8xh4nilg049c834