merge
authorFabien Pinckaers <fp@tinyerp.com>
Wed, 24 Sep 2008 09:20:09 +0000 (11:20 +0200)
committerFabien Pinckaers <fp@tinyerp.com>
Wed, 24 Sep 2008 09:20:09 +0000 (11:20 +0200)
commit88c24bf5c70904944055145dc997f0f25b3e54c9
tree61d712c59c24dfd8f76d631d5a31a1705e1ee72d
parente2808f44c3cf1dab3548fc70fdab7ab026fa83a5
parentbb147d305c2128e5d9a2761e267193062216ad64
merge

bzr revid: fp@tinyerp.com-20080924092009-4v1bvit303b3t5me