[MERGE]
authorStephane Wirtel <stephane@tinyerp.com>
Mon, 12 Jan 2009 12:01:40 +0000 (13:01 +0100)
committerStephane Wirtel <stephane@tinyerp.com>
Mon, 12 Jan 2009 12:01:40 +0000 (13:01 +0100)
bzr revid: stephane@tinyerp.com-20090112120140-llwf3m8arz6bh6e9


Trivial merge