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)
commit4d65a4e820d769871d51b65f57a8ea9847750a63
tree5ed4992fb3e4eec1a963073aca7c0124f3acde08
parent3ba8d8d52c34c78017608f74a0490eefe92ca1f6
parent151ac3fa6cbc8ac3fce6ecb7a23246fc1f61fc54
Merge commit '6.0.1' into official

bzr revid: xrg@openerp.com-20110120201628-nr5ua2671z3wpmlt