[MERGE] merged the dev3 branch
authorqdp-launchpad@tinyerp.com <>
Thu, 20 Jan 2011 12:23:20 +0000 (13:23 +0100)
committerqdp-launchpad@tinyerp.com <>
Thu, 20 Jan 2011 12:23:20 +0000 (13:23 +0100)
commit9bfe07dcbf229d9c4a6231e7745a5f0fb9ad46a5
treefe0e911958fbff1bbf3ff0e16e18bc017ad73ed4
parentc27736c6a5407753ace49f6f2b247d5b0ce2e90a
parent1df94f7aad5eb3939807be053dbfa2289e091790
[MERGE] merged the dev3 branch

bzr revid: qdp-launchpad@tinyerp.com-20110120122320-pve8hcz3pvc6ttgw