[MERGE]
authorStephane Wirtel <stephane@tinyerp.com>
Fri, 6 Feb 2009 13:27:09 +0000 (14:27 +0100)
committerStephane Wirtel <stephane@tinyerp.com>
Fri, 6 Feb 2009 13:27:09 +0000 (14:27 +0100)
bzr revid: stephane@tinyerp.com-20090206132709-y7jokojt3ipda2w1


Trivial merge