reverting configure_new.defaults
Merge remote branch 'origin/svnmerge' into svnmerge
Merge remote branch 'origin/svnmerge' into svnmerge
Merge branch 'svnmerge' of 50.19.250.240:/home/git/wrf-fire into svnmerge
fixing more dependencies for fire->sfire
Merge branch 'svnmerge' of 50.19.250.240:/home/git/wrf-fire into svnmerge
yet more fixes for fire->sfire
Merge branch 'svnmerge' of 50.19.250.240:/home/git/wrf-fire into svnmerge
fixing bad merge conflict resolution in WPS