Merge branch 'master' of ssh://git.gag.com/scm/git/hw/altusmetrum

Conflicts:
	packages/Makefile

diff --cc packages/Makefile
index c5b283ddaa1bee1468b3b04c7fa22b48ecac3c6e,e665e4d4433248a44ef7237e48ac004cc39834e2..746d3138982913bc2930a06caac1e725c7411c20
--- 1/packages/Makefile
--- 2/packages/Makefile
+++ b/packages/Makefile
@@@ -42,9 -42,10 +42,15 @@@ FOOTPRINTS= 
        ADXL78.fp \
        MOT1317.fp \
        mlp8-4x3.fp \
 -      bc4aa.fp
 +      saw.fp \
 +      cubesatshield.fp \
 +      linear-s8.fp
+       ufqfpn48.fp \
+       saw.fp \
+       tfsoj-8.fp \
++      bc4aa.fp \
++      cubesatshield.fp \
++      linear-s8.fp
  
  .5c.fp:
        nickle $*.5c > $@