[merge] merge trunk-minimal-bin-chs branch
authorChristophe Simonis <chs@openerp.com>
Fri, 23 Nov 2012 16:50:01 +0000 (17:50 +0100)
committerChristophe Simonis <chs@openerp.com>
Fri, 23 Nov 2012 16:50:01 +0000 (17:50 +0100)
bzr revid: chs@openerp.com-20121123165001-3pxmcetvu8l4mutg


Trivial merge