[merge] from trunk
authorXavier Morel <xmo@tinyerp.com>
Thu, 17 Dec 2009 19:23:01 +0000 (20:23 +0100)
committerXavier Morel <xmo@tinyerp.com>
Thu, 17 Dec 2009 19:23:01 +0000 (20:23 +0100)
bzr revid: xmo@tinyerp.com-20091217180955-jmqmc7hgh6831nj1
bzr revid: xmo@tinyerp.com-20091217183735-0hhsf8nm77933101
bzr revid: xmo@tinyerp.com-20091217192301-4hz9e280ebm2tds2


Trivial merge