Merge remote-tracking branch 'whot/for-keith'
authorKeith Packard <keithp@keithp.com>
Thu, 14 Nov 2013 08:02:04 +0000 (17:02 +0900)
committerKeith Packard <keithp@keithp.com>
Thu, 14 Nov 2013 08:02:04 +0000 (17:02 +0900)

Trivial merge