Merge remote-tracking branch 'origin/master'
authorKeith Packard <keithp@keithp.com>
Sat, 25 Jan 2014 06:27:58 +0000 (22:27 -0800)
committerKeith Packard <keithp@keithp.com>
Sat, 25 Jan 2014 06:27:58 +0000 (22:27 -0800)

Trivial merge