merge
authorFabien Pinckaers <fp@tinyerp.com>
Wed, 10 Sep 2008 21:41:10 +0000 (23:41 +0200)
committerFabien Pinckaers <fp@tinyerp.com>
Wed, 10 Sep 2008 21:41:10 +0000 (23:41 +0200)
commit4ee0e1f07f1c36323f695d1ba0f907f58747dd9c
tree50a33258ce985c9a5b5a1702d22232dda39876ee
parent705d85b2e9eebf8539010d30b9962a00172ddd42
parent606165c849bc29655fefbff50e3f283fd44f7b19
merge

bzr revid: fp@tinyerp.com-20080910214110-xah43u6pjne1tdx4