[MERGE] merge team3's work of sprint 22-23
authorqdp-launchpad@tinyerp.com <>
Fri, 18 Jun 2010 14:03:04 +0000 (16:03 +0200)
committerqdp-launchpad@tinyerp.com <>
Fri, 18 Jun 2010 14:03:04 +0000 (16:03 +0200)
bzr revid: qdp-launchpad@tinyerp.com-20100618140304-yxomezlycdidk98c


Trivial merge