diff --git a/lib/OpenLayers/Request.js b/lib/OpenLayers/Request.js
index c5e985e8d0..0434e1d874 100644
--- a/lib/OpenLayers/Request.js
+++ b/lib/OpenLayers/Request.js
@@ -3,7 +3,7 @@
  * full text of the license. */
 
 /**
- * @requires OpenLayers/Events.js 
+ * @requires OpenLayers/Events.js
  */
 
 /**
diff --git a/tools/mergejs.py b/tools/mergejs.py
index 96c80d5d0d..8077675e1d 100755
--- a/tools/mergejs.py
+++ b/tools/mergejs.py
@@ -152,7 +152,7 @@ def run (sourceDirectory, outputFilename = None, configFile = None):
     ## TODO: Do import when we walk the directories above?
     for filepath in allFiles:
         print "Importing: %s" % filepath
-        fullpath = os.path.join(sourceDirectory, filepath)
+        fullpath = os.path.join(sourceDirectory, filepath).strip()
         content = open(fullpath, "U").read() # TODO: Ensure end of line @ EOF?
         files[filepath] = SourceFile(filepath, content) # TODO: Chop path?
 
@@ -181,7 +181,7 @@ def run (sourceDirectory, outputFilename = None, configFile = None):
                 order.append(filepath)
                 if not files.has_key(filepath):
                     print "Importing: %s" % filepath
-                    fullpath = os.path.join(sourceDirectory, filepath)
+                    fullpath = os.path.join(sourceDirectory, filepath).strip()
                     content = open(fullpath, "U").read() # TODO: Ensure end of line @ EOF?
                     files[filepath] = SourceFile(filepath, content) # TODO: Chop path?