merge
authorFabien Pinckaers <fp@tinyerp.com>
Tue, 1 Sep 2009 19:00:06 +0000 (21:00 +0200)
committerFabien Pinckaers <fp@tinyerp.com>
Tue, 1 Sep 2009 19:00:06 +0000 (21:00 +0200)
commit9eee880b0eabe6957a4366ae331fde58d52d3e3c
treea68ac8554f08677911871fab712bbbb5aac013c4
parentdbff4995df60fbbc17561e0f6b45a9fb524c90c1
parent40666e1316c447aac0ca69746dba3428e087376a
merge

bzr revid: fp@tinyerp.com-20090901190006-i2tjwcrl71vnm2kv