[MERGE]
authorStephane Wirtel <stephane@tinyerp.com>
Fri, 28 Nov 2008 14:57:13 +0000 (15:57 +0100)
committerStephane Wirtel <stephane@tinyerp.com>
Fri, 28 Nov 2008 14:57:13 +0000 (15:57 +0100)
bzr revid: stephane@tinyerp.com-20081128145713-4l9nla2vukth1bec


Trivial merge