merge
authorFabien Pinckaers <fp@tinyerp.com>
Mon, 24 Nov 2008 18:13:49 +0000 (19:13 +0100)
committerFabien Pinckaers <fp@tinyerp.com>
Mon, 24 Nov 2008 18:13:49 +0000 (19:13 +0100)
bzr revid: fp@tinyerp.com-20081124181349-jrmy9gfhtmb9nzt0


Trivial merge