merge
authorFabien Pinckaers <fp@tinyerp.com>
Mon, 6 Oct 2008 21:36:57 +0000 (23:36 +0200)
committerFabien Pinckaers <fp@tinyerp.com>
Mon, 6 Oct 2008 21:36:57 +0000 (23:36 +0200)
commitfee6f8c07bace0b5137b98996e36b2b89aab8a1a
tree113dffc6f1bba80b21017b858f21e2fc9306ec03
parent9e6f14b8521cf00c998da4febf3eca1fffaeee65
parent79100b55ec1723edb832b3a8d41c1a87973786b9
merge

bzr revid: fp@tinyerp.com-20081006213657-ybymtgzmkm0auw0r