[MERGE]
authorStephane Wirtel <stephane@tinyerp.com>
Fri, 23 Jan 2009 14:53:01 +0000 (15:53 +0100)
committerStephane Wirtel <stephane@tinyerp.com>
Fri, 23 Jan 2009 14:53:01 +0000 (15:53 +0100)
bzr revid: stephane@tinyerp.com-20090123145301-8ld0ouoc9vhohe0e


Trivial merge