merge
authorFabien Pinckaers <fp@tinyerp.com>
Wed, 1 Sep 2010 13:06:54 +0000 (15:06 +0200)
committerFabien Pinckaers <fp@tinyerp.com>
Wed, 1 Sep 2010 13:06:54 +0000 (15:06 +0200)
commit258920846a9f1d1fdaf7fc2398def1328ba07752
tree9e053ece7df961de93ff3f4df6f7e5df53e05d12
parent5a40116fc99aa18f4cb1699ede6dd6452abe3554
parent4ecbf905cc2710e742eae491f0f3c833f303cb1b
merge

bzr revid: fp@tinyerp.com-20100901130654-9gwqxakc6d6b71qi