Merge remote-tracking branch 'origin/master'
authorKeith Packard <keithp@keithp.com>
Fri, 26 Apr 2013 05:22:50 +0000 (22:22 -0700)
committerKeith Packard <keithp@keithp.com>
Fri, 26 Apr 2013 05:22:50 +0000 (22:22 -0700)

Trivial merge