[MERGE]
authorStephane Wirtel <stephane@tinyerp.com>
Tue, 16 Jun 2009 14:30:35 +0000 (16:30 +0200)
committerStephane Wirtel <stephane@tinyerp.com>
Tue, 16 Jun 2009 14:30:35 +0000 (16:30 +0200)
bzr revid: stephane@tinyerp.com-20090616143035-mpxmwhbawcy0vi6w


Trivial merge