[MERGE] merged the apa branch
authorqdp-launchpad@tinyerp.com <>
Thu, 25 Nov 2010 10:17:01 +0000 (11:17 +0100)
committerqdp-launchpad@tinyerp.com <>
Thu, 25 Nov 2010 10:17:01 +0000 (11:17 +0100)
bzr revid: qdp-launchpad@tinyerp.com-20101125101701-cr5c3vlkdgy8sqak


Trivial merge