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 0a91f939db0a51fe6f4828c5dfa23473e069ab98,56ac0520e2240020f9f24adcdfff3a1df0a8e0da..35a1b99035665f21d3de454270a89cb5f8f7ebd1
--- 1/ao-tools/altosui/Makefile.am
--- 2/ao-tools/altosui/Makefile.am
+++ b/ao-tools/altosui/Makefile.am
@@@ -108,11 -99,9 +110,9 @@@ all-local: classes/altosui $(JAR) altos
  clean-local:
        -rm -rf classes $(JAR) $(FATJAR) \
                $(LINUX_DIST) $(MACOSX_DIST) windows $(WINDOWS_DIST) $(FREETTS_CLASS) \
 -              $(LIBALTOS) Manifest.txt Manifest-fat.txt altos-windows.log \
 +              $(JFREECHART_CLASS) $(LIBALTOS) Manifest.txt Manifest-fat.txt altos-windows.log \
                altosui altosui-test macosx linux
  
- fat: $(FATJAR) $(LINUX_DIST) $(MACOSX_DIST) $(WINDOWS_DIST)
- 
  if FATINSTALL
  
  FATTARGET=$(FATDIR)/$(VERSION)