[MERGE] merged dev2 branch
authorqdp-launchpad@tinyerp.com <>
Thu, 20 Jan 2011 12:34:15 +0000 (13:34 +0100)
committerqdp-launchpad@tinyerp.com <>
Thu, 20 Jan 2011 12:34:15 +0000 (13:34 +0100)
bzr revid: qdp-launchpad@tinyerp.com-20110120123415-fghbg07o9au9erbg


Trivial merge