merge

diff --cc tests/run_readelf_tests.py
index acb496443cd0886022e5051d062efe1541c88ed2,9142c1dc248ff64fddd42156f8ba3485c0c2ccba..5e66318c72cbf924924342a89ee9318291539fff
--- 1/tests/run_readelf_tests.py
--- 2/tests/run_readelf_tests.py
+++ b/tests/run_readelf_tests.py
@@@ -185,8 -182,6 +185,8 @@@ def main()
  
  
  if __name__ == '__main__':
-     import os
-     os.chdir('..')
++    #import os
++    #os.chdir('..')
      main()
      #testlog.info(list(discover_testfiles('tests/testfiles'))) 
      #print run_exe('scripts/readelf.py', ['-h', 'tests/testfiles/z32.o.elf'])