[MERGE] merge with main branch
authorqdp-launchpad@tinyerp.com <>
Tue, 6 Jul 2010 17:24:22 +0000 (19:24 +0200)
committerqdp-launchpad@tinyerp.com <>
Tue, 6 Jul 2010 17:24:22 +0000 (19:24 +0200)
commit303aa7932064a3cd7ab4d300a68d00747d121a0a
tree5403e2c1fb597c5cd3754db9e06f4170639250e4
parent969f90e3cb5c45aacebc28320a24ac30cccbdbf1
parent1d9cbd3aae1654762192e66ff434a87108efb5f3
[MERGE] merge with main branch

bzr revid: qdp-launchpad@tinyerp.com-20100706172422-bnkiuvwel9zdoj6j