merge
authorFabien Pinckaers <fp@tinyerp.com>
Sat, 20 Sep 2008 13:23:05 +0000 (15:23 +0200)
committerFabien Pinckaers <fp@tinyerp.com>
Sat, 20 Sep 2008 13:23:05 +0000 (15:23 +0200)
commitc2800212faa217e681aedb2d6838bd87d1a4e699
treed73627879acbd43b4c87952873d9247b7bdec90a
parent2ce980e39f83f9aaa5e61a8638e2d220ba28050c
parent959c926ae505eda160a5d36d2896962bb0afabed
merge

bzr revid: fp@tinyerp.com-20080920132305-62yp38qi87zcdiev