Merge commit 'origin/master'
authorKeith Packard <keithp@keithp.com>
Tue, 16 Jun 2009 05:19:28 +0000 (22:19 -0700)
committerKeith Packard <keithp@keithp.com>
Tue, 16 Jun 2009 05:19:28 +0000 (22:19 -0700)

Trivial merge