Merge remote-tracking branch 'origin/master' into micropeak-logging
authorKeith Packard <keithp@keithp.com>
Mon, 31 Dec 2012 22:24:59 +0000 (14:24 -0800)
committerKeith Packard <keithp@keithp.com>
Mon, 31 Dec 2012 22:24:59 +0000 (14:24 -0800)

Trivial merge