merge
authorFabien Pinckaers <fp@tinyerp.com>
Mon, 3 Aug 2009 07:01:56 +0000 (09:01 +0200)
committerFabien Pinckaers <fp@tinyerp.com>
Mon, 3 Aug 2009 07:01:56 +0000 (09:01 +0200)
commit5ebd3bc12cb0940d95dbfeb78e60e5a4ce174d06
treefbbea591e5cd0659abc53f92d24adba143dc45f0
parent3472508614e7ee985d8f87faf4e6a658d5bdca56
parent738dc7153439aa6a02a35a23449214265547e516
merge

bzr revid: fp@tinyerp.com-20090803070156-38o2tyzljrlsuh84