Merge branch 'master' of git://git.gag.com/fw/altos

diff --cc ao-tools/altosui/AltosUI.java
Simple merge

diff --cc ao-tools/altosui/Makefile.am
index 35a1b99035665f21d3de454270a89cb5f8f7ebd1,7070af22e7fda87a0786a7e5d818b08a793f266a..ab8ca7d4a80163b4ed385a64ac65c12702a136b8
--- 1/ao-tools/altosui/Makefile.am
--- 2/ao-tools/altosui/Makefile.am
+++ b/ao-tools/altosui/Makefile.am
@@@ -48,21 -51,10 +51,21 @@@ altosui_JAVA = 
        AltosState.java \
        AltosStatusTable.java \
        AltosTelemetry.java \
-       AltosTelemetryReader.java \
+       AltosTelemetryIterable.java \
        AltosUI.java \
 +    AltosCsvReader.java \
 +    AltosDataPoint.java \
 +    AltosGraph.java \
 +    AltosGraphTime.java \
 +    AltosGraphUI.java \
 +    AltosGraphDataChooser.java \
        AltosVoice.java
  
 +JFREECHART_CLASS= \
 +    jfreechart.jar \
 +    jcommon.jar \
 +    csv.jar
 +
  FREETTS_CLASS= \
        cmudict04.jar \
        cmulex.jar \