Merge branch 'macos'
authorKeith Packard <keithp@keithp.com>
Wed, 28 Jul 2010 18:20:22 +0000 (11:20 -0700)
committerKeith Packard <keithp@keithp.com>
Wed, 28 Jul 2010 18:20:22 +0000 (11:20 -0700)

Trivial merge