+Date: Tue Aug 18 18:09:38 2009 -0600
+
+ Merge branch 'master' of ssh://git.gag.com/scm/git/fw/altos
+
+ Conflicts:
+ ao-tools/ao-bitbang/Makefile.am
+ ao-tools/ao-eeprom/Makefile.am
+ ao-tools/ao-load/Makefile.am
+ ao-tools/ao-load/ao-load.c
+ ao-tools/ao-rawload/Makefile.am
+
+commit c29275b72438637d46d7a50742882d2736eb176a
+Author: Keith Packard <keithp@keithp.com>
+Date: Tue Aug 18 15:21:57 2009 -0700
+
+ Add manual pages for remaining commands.
+
+ Manuals written for ao-bitbang, ao-eeprom, ao-load, ao-rawload and
+ ao-view.
+
+ Manual for ao-dbg updated to reflect program name change.
+
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit 9b03d620722dc54630539afba40720c30de69b2d
+Author: Keith Packard <keithp@keithp.com>
+Date: Tue Aug 18 12:19:31 2009 -0700
+
+ Use --tty/-T on command line to specify target device
+
+ Also, use the ALTOS_TTY environment variable in all tools. Note that
+ the magic value of "BITBANG" switches the library to connecting
+ through a CP2103 instead.
+
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit 7c790fe859dff062692964338091ffbbcdf63257
+Author: Keith Packard <keithp@keithp.com>
+Date: Tue Aug 18 12:40:24 2009 -0700
+
+ Rename tools to ao-<foo>
+
+ Use a consistent prefix to make it easier to remember which programs
+ belong to this package
+
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit 1c2a0b6653623b689d68d7349a6b2dce3e20a4a6
+Author: Keith Packard <keithp@keithp.com>
+Date: Tue Aug 18 13:36:54 2009 -0700
+
+ re-add debugger sources
+
+commit 9a9cce5510b87252f863239ac807b9fb4395b288
+Author: Keith Packard <keithp@keithp.com>
+Date: Tue Aug 18 12:19:31 2009 -0700
+
+ Start working on using getopt for the tty name