[MERGE] merged with server-trunk-development branch

bzr revid: hmo@tinyerp.com-20110214053133-4b1v33p9lurib9pb
2011-02-14 11:01:33 +05:30
parent d31260e8a8 14ebc46e3a
commit 53c1d9781e
1 changed files with 2 additions and 0 deletions
@@ -37,9 +37,11 @@ from os.path import join
 from datetime import datetime
 from lxml import etree

+import config
 import misc
 from misc import UpdateableStr
 from misc import SKIPPED_ELEMENT_TYPES
+import osutil

 _LOCALE2WIN32 = {
    'af_ZA': 'Afrikaans_South Africa',