[MERGE] merge with same branch
authorqdp-launchpad@tinyerp.com <>
Tue, 5 Oct 2010 10:51:35 +0000 (12:51 +0200)
committerqdp-launchpad@tinyerp.com <>
Tue, 5 Oct 2010 10:51:35 +0000 (12:51 +0200)
bzr revid: qdp-launchpad@tinyerp.com-20101005105135-ay3ym3ywm19lieo7


Trivial merge