[MERGE] merged the dev3 branch
authorqdp-launchpad@tinyerp.com <>
Tue, 18 Jan 2011 14:33:04 +0000 (15:33 +0100)
committerqdp-launchpad@tinyerp.com <>
Tue, 18 Jan 2011 14:33:04 +0000 (15:33 +0100)
commit07609d152fc99034d0f5122c08f4730135f86457
tree4089585c67f6f8035678e46f74420037b09173f6
parent3f18729893da7b2f33b64cf8f20aa36f6eb28a1c
parent463c822b55bfa2efa659a035be2464555e210930
[MERGE] merged the dev3 branch

bzr revid: qdp-launchpad@tinyerp.com-20110118143304-i6k39ywdab2iv7e4