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)
commite3220d7bae4548bf64e5879c981ad070ac1f78f7
tree2e7da89e737a6f8d3abbdde268ea2e9e4eae92b6
parent73b2660d7273d175d279d22f8ca0c3932a14ff1c
parent2523a445a09a75a8baf642608d099a5e12d5437f
Merge commit '2523a445a09a75a8baf642608d099a5e12d5437f'

This is merging the commits along Peter's for-keith branch, without
also merging in the spurious merge at the top of that branch.