Merge commit '2523a445a09a75a8baf642608d099a5e12d5437f'
authorKeith Packard <keithp@keithp.com>
Sat, 19 Oct 2013 00:22:52 +0000 (17:22 -0700)
committerKeith Packard <keithp@keithp.com>
Sat, 19 Oct 2013 00:22:52 +0000 (17:22 -0700)
This is merging the commits along Peter's for-keith branch, without
also merging in the spurious merge at the top of that branch.


Trivial merge