Merge remote-tracking branch 'jeremyhu/master'
authorKeith Packard <keithp@keithp.com>
Wed, 22 Jan 2014 19:28:54 +0000 (11:28 -0800)
committerKeith Packard <keithp@keithp.com>
Wed, 22 Jan 2014 19:28:54 +0000 (11:28 -0800)

Trivial merge