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

diff --combined telefireone.sch
index 96b57ead6450976c1d3b15d4b31452305b634513,a50e922739b304d56e18b5244dabd004954746da..99ee342bd551b7c94cabe10f364dab92f91902de
--- 1/telefireone.sch
--- 2/telefireone.sch
+++ b/telefireone.sch
@@@ -137,7 -137,7 +137,7 @@@ device=RESISTO
  T 44300 46700 5 10 1 1 180 0 1
  refdes=R8
  T 44700 46700 5 10 1 1 180 0 1
- value=100
+ value=1k
  T 43900 46300 5 10 0 1 90 0 1
  footprint=0402
  }
@@@ -1565,7 -1565,7 +1565,7 @@@ footprint=040
  T 58500 49200 5 10 1 1 180 0 1
  refdes=R7
  T 58900 49200 5 10 1 1 180 0 1
- value=100
+ value=1k
  }
  N 59000 48900 59500 48900 4
  C 59500 48600 1 0 0 FDS9926A.sym
@@@ -1612,7 -1612,7 +1612,7 @@@ footprint=040
  T 58500 46700 5 10 1 1 180 0 1
  refdes=R16
  T 58900 46700 5 10 1 1 180 0 1
- value=100
+ value=1k
  }
  N 59000 46400 59500 46400 4
  C 59500 46100 1 0 0 FDS9926A.sym
@@@ -2108,8 -2108,6 +2108,8 @@@ T 41000 59800 5 10 0 1 0 0 
  footprint=100mil5pin
  T 40900 59700 5 10 1 1 0 0 1
  value=USB header
 +T 41900 60000 5 10 0 1 0 0 1
 +device=CONNECTOR
  }
  N 41900 60100 43800 60100 4
  C 63100 43100 1 90 0 capacitor.sym