Merge commit 'origin/master' into olesenm

wmake/wmake

@@ -157,7 +157,8 @@ then
         exit $?
     elif [ ! -d $MakeDir ]
     then
-        $make -k -f $WM_DIR/MakefileApps FOAM_APPS="`find . -maxdepth 1 \( -type d -a ! -name "." -a ! -name ".svn" -a ! -name "Make" \)  -printf "%f "`"
+        $make -k -f $WM_DIR/MakefileApps \
+            FOAM_APPS="`find . -maxdepth 1 \( -type d -a ! -name "." -a ! -name "Optional" -a ! -name "Make" \)  -printf "%f "`"
         exit $?
     fi
 

wmake/wmakeLnInclude

@@ -126,7 +126,7 @@ echo
 cd $incDir
 
 find .. $findOpt \
-    \( -name lnInclude -o -name -Make -o -name .svn -o -name config \) -prune  \
+    \( -name lnInclude -o -name -Make -o -name config \) -prune  \
  -o \( -name '*.[CHh]' -o -name '*.[ch]xx' -o -name '*.[ch]pp' -o -name '*.type' \)  \
  -a ! -name ".#*"     \
  -exec ln $lnOpt {} . \;