diff -r 87cfa131b535 -r e7e0ae78773e configurationengine/source/scripts/tests/unittest_merge.py
--- a/configurationengine/source/scripts/tests/unittest_merge.py	Fri Mar 12 08:30:17 2010 +0200
+++ b/configurationengine/source/scripts/tests/unittest_merge.py	Tue Aug 10 14:29:28 2010 +0300
@@ -21,7 +21,7 @@
 import os
 import shutil
 import zipfile
-import __init__
+
 from testautomation.base_testcase import BaseTestCase
 from testautomation import unzip_file
 from scripttest_common import get_cmd
@@ -86,7 +86,7 @@
     def test_get_help(self):
         cmd = '%s -h' % get_cmd('merge')
         out = self.run_command(cmd)
-        lines = out.split('\r\n')
+        lines = out.split(os.linesep)
         self.assertTrue('Options:' in lines)
         self.assertTrue('  Merge options:' in lines)