Merge commit 'origin/master'
authorKeith Packard <keithp@keithp.com>
Sat, 6 Jun 2009 23:41:16 +0000 (16:41 -0700)
committerKeith Packard <keithp@keithp.com>
Sat, 6 Jun 2009 23:41:16 +0000 (16:41 -0700)

Trivial merge