Merge remote-tracking branch 'mjb/altoslib_mjb'

author Keith Packard <keithp@keithp.com>

Sun, 9 Sep 2012 20:03:47 +0000 (13:03 -0700)

committer Keith Packard <keithp@keithp.com>

Sun, 9 Sep 2012 20:03:47 +0000 (13:03 -0700)
author Keith Packard <keithp@keithp.com>
Sun, 9 Sep 2012 20:03:47 +0000 (13:03 -0700)
committer Keith Packard <keithp@keithp.com>
Sun, 9 Sep 2012 20:03:47 +0000 (13:03 -0700)
diff --cc altoslib/AltosConfigData.java
Simple merge
diff --cc altoslib/AltosLib.java
Simple merge
author	Keith Packard <keithp@keithp.com>
	Sun, 9 Sep 2012 20:03:47 +0000 (13:03 -0700)
committer	Keith Packard <keithp@keithp.com>
	Sun, 9 Sep 2012 20:03:47 +0000 (13:03 -0700)
		1	2
altoslib/AltosConfigData.java	patch \|	diff1 \|	diff2 \|	blob \| history
altoslib/AltosLib.java	patch \|	diff1 \|	diff2 \|	blob \| history