merge
authorFabien Pinckaers <fp@tinyerp.com>
Wed, 31 Mar 2010 14:49:35 +0000 (16:49 +0200)
committerFabien Pinckaers <fp@tinyerp.com>
Wed, 31 Mar 2010 14:49:35 +0000 (16:49 +0200)
bzr revid: fp@tinyerp.com-20100331144935-qqzvrmolejwcv6hl


Trivial merge