Merge branch 'master' of opencircuitdesign.com:/home/tim/gitsrc/open_pdks/

Conflicts:
	common/spectre_to_spice.py

Merged additional code for spectre_to_spice.py.

common/spectre_to_spice.py

diff --git a/common/spectre_to_spice.py b/common/spectre_to_spice.py
index 6d137d5..2a1ff64 100755
--- a/common/spectre_to_spice.py
+++ b/common/spectre_to_spice.py
@@ -183,6 +183,12 @@
     finalline = re.sub('isnoisy[ \t]*=[ \t]*{no}', 'isnoisy=0', finalline)
     finalline = re.sub('isnoisy[ \t]*=[ \t]*{yes}', 'isnoisy=1', finalline)
 
+    # Use of "m" in parameters is forbidden.  Specifically look for "{N*m}".
+    # e.g., replace "mult = {2*m}" with "mult = 2".  Note that this usage
+    # is most likely an error in the source.
+
+    finalline = re.sub('\{([0-9]+)\*[mM]\}', r'\1', finalline)
+
     return finalline, ispassed
 
 def get_param_names(line):