Merge commit '6.0.1' into official
authorP. Christeas <xrg@openerp.com>
Thu, 20 Jan 2011 20:16:28 +0000 (21:16 +0100)
committerP. Christeas <xrg@openerp.com>
Thu, 20 Jan 2011 20:16:28 +0000 (21:16 +0100)
bzr revid: xrg@openerp.com-20110120201628-nr5ua2671z3wpmlt


Trivial merge