Index: ns-3.1/wscript
===================================================================
--- ns-3.1/wscript	(revision 52)
+++ ns-3.1/wscript	(revision 53)
@@ -243,7 +243,9 @@
 def add_scratch_programs(bld):
     all_modules = [mod[len("ns3-"):] for mod in bld.env()['NS3_MODULES']]
     for filename in os.listdir("scratch"):
-        if os.path.isdir(os.path.join("scratch", filename)):
+        if filename.startswith('.svn') or name.startswith('CVS'):
+	    continue
+        elif os.path.isdir(os.path.join("scratch", filename)):
             obj = bld.create_ns3_program(filename, all_modules)
             obj.path = obj.path.find_dir('scratch')
             obj.find_sources_in_dirs(filename)
@@ -631,7 +633,7 @@
             elif os.path.isdir(srcname):
                 if name in excludes:
                     continue
-                elif name.startswith('.') or name.startswith(',,') or name.startswith('++'):
+                elif name.startswith('.') or name.startswith(',,') or name.startswith('++') or name.startswith('.svn') or name.startswith('CVS'):
                     continue
                 elif name == build_dir:
                     continue