merge
authorFabien Pinckaers <fp@tinyerp.com>
Tue, 12 May 2009 13:57:28 +0000 (15:57 +0200)
committerFabien Pinckaers <fp@tinyerp.com>
Tue, 12 May 2009 13:57:28 +0000 (15:57 +0200)
commita39fd68136dfdc48ca31caaf5c00e940243724e2
treef56a446bf3066133103c8ed4297187813b5eb8ac
parent76851602184752781e676fadd92756f91f079bf7
parent454fac5991bfbda3dcc81651e483d905efdd9005
merge

bzr revid: fp@tinyerp.com-20090512135728-c3kx94s5q0a2b8ev