Merge remote-tracking branch 'origin/master'
authorKeith Packard <keithp@keithp.com>
Sun, 3 Apr 2011 00:58:38 +0000 (17:58 -0700)
committerKeith Packard <keithp@keithp.com>
Sun, 3 Apr 2011 00:58:38 +0000 (17:58 -0700)

Trivial merge