Merge remote-tracking branch 'origin/master'
authorKeith Packard <keithp@keithp.com>
Wed, 5 Feb 2014 07:42:23 +0000 (23:42 -0800)
committerKeith Packard <keithp@keithp.com>
Wed, 5 Feb 2014 07:42:23 +0000 (23:42 -0800)

Trivial merge