[MERGE] opw 5801
authorolt@tinyerp.com <>
Fri, 27 Jan 2012 09:02:49 +0000 (10:02 +0100)
committerolt@tinyerp.com <>
Fri, 27 Jan 2012 09:02:49 +0000 (10:02 +0100)
bzr revid: olt@tinyerp.com-20120127090249-919qxtfbjhdwj4in

1  2 
bin/tools/translate.py

Simple merge