Merge remote branch 'origin/master' into altosui
authorKeith Packard <keithp@keithp.com>
Thu, 8 Apr 2010 18:46:56 +0000 (11:46 -0700)
committerKeith Packard <keithp@keithp.com>
Thu, 8 Apr 2010 18:46:56 +0000 (11:46 -0700)

Trivial merge