[MERGE] merged dev2 branch
authorqdp-launchpad@tinyerp.com <>
Fri, 28 Jan 2011 11:25:32 +0000 (12:25 +0100)
committerqdp-launchpad@tinyerp.com <>
Fri, 28 Jan 2011 11:25:32 +0000 (12:25 +0100)
commit828481bc6a41f56fd5eb68385eef72239fbb573d
treea32f09208d3ff09bb66dcd929e549cb690932c86
parent9fb4e60e689fb1557171d4ddf7a687782dffd4ca
parent8a6d2875fba75ff167f79bdaddd55de343294657
[MERGE] merged dev2 branch

bzr revid: qdp-launchpad@tinyerp.com-20110128112532-b2te782ia9ku7g94