[MERGE] merge with trunk addons branch
authorqdp-launchpad@tinyerp.com <>
Tue, 24 Aug 2010 11:00:03 +0000 (13:00 +0200)
committerqdp-launchpad@tinyerp.com <>
Tue, 24 Aug 2010 11:00:03 +0000 (13:00 +0200)
bzr revid: qdp-launchpad@tinyerp.com-20100824110003-1xs202qaihtyopxr


Trivial merge