merge
authorFabien Pinckaers <fp@tinyerp.com>
Wed, 2 Jun 2010 14:08:58 +0000 (16:08 +0200)
committerFabien Pinckaers <fp@tinyerp.com>
Wed, 2 Jun 2010 14:08:58 +0000 (16:08 +0200)
bzr revid: fp@tinyerp.com-20100602140858-lb6wlmbvtkj7vu8w


Trivial merge