merge
authorFabien Pinckaers <fp@tinyerp.com>
Fri, 25 Jun 2010 09:27:54 +0000 (11:27 +0200)
committerFabien Pinckaers <fp@tinyerp.com>
Fri, 25 Jun 2010 09:27:54 +0000 (11:27 +0200)
commit57a6ea7761abab5ac9b748915e7b173c0ddfe27a
tree9ba79a052e517888d5c0f251fc4457a3efe335e6
parentfd7f7738275d189f27d44b786c3a9440d94f3206
parent03c28818a4b9045a599846880be300b157f8ea4c
merge

bzr revid: fp@tinyerp.com-20100625092754-hoxvok4rfbcrpah8