[MERGE] from trunk
authorChristophe Matthieu <chm@openerp.com>
Mon, 10 Dec 2012 09:53:25 +0000 (10:53 +0100)
committerChristophe Matthieu <chm@openerp.com>
Mon, 10 Dec 2012 09:53:25 +0000 (10:53 +0100)
commitab2792850f3fc0cb76c8b4576a6e1311873b918c
treef45a305721817787ecac4914e559522538edefc8
parent74d514a213d4b11dd765304629f75be5de877c93
parent7f1d5daf2f7a137a470a4a72779408edf7995910
[MERGE] from trunk

bzr revid: chm@openerp.com-20121210095325-84gkwkzvg3pfz42d