Merge remote-tracking branch 'jeremyhu/master'
authorKeith Packard <keithp@keithp.com>
Thu, 14 Feb 2013 19:05:48 +0000 (11:05 -0800)
committerKeith Packard <keithp@keithp.com>
Thu, 14 Feb 2013 19:05:48 +0000 (11:05 -0800)

Trivial merge