Merge remote-tracking branch 'origin/master' into micropeak-logging
authorKeith Packard <keithp@keithp.com>
Sat, 29 Dec 2012 05:50:13 +0000 (21:50 -0800)
committerKeith Packard <keithp@keithp.com>
Sat, 29 Dec 2012 05:50:13 +0000 (21:50 -0800)

Trivial merge