Merge commit 'origin/bdale'
authorKeith Packard <keithp@keithp.com>
Sun, 5 Jul 2009 15:09:22 +0000 (08:09 -0700)
committerKeith Packard <keithp@keithp.com>
Sun, 5 Jul 2009 15:09:22 +0000 (08:09 -0700)

Trivial merge