Merge remote-tracking branch 'jeremyhu/master'
authorKeith Packard <keithp@keithp.com>
Thu, 10 Apr 2014 04:59:17 +0000 (21:59 -0700)
committerKeith Packard <keithp@keithp.com>
Thu, 10 Apr 2014 04:59:17 +0000 (21:59 -0700)

Trivial merge