Merge remote-tracking branch 'jeremyhu/master'
authorKeith Packard <keithp@keithp.com>
Tue, 8 Oct 2013 00:29:38 +0000 (17:29 -0700)
committerKeith Packard <keithp@keithp.com>
Tue, 8 Oct 2013 00:29:38 +0000 (17:29 -0700)

Trivial merge