Merge commit 'origin/master'
authorKeith Packard <keithp@keithp.com>
Mon, 15 Jun 2009 00:57:58 +0000 (17:57 -0700)
committerKeith Packard <keithp@keithp.com>
Mon, 15 Jun 2009 00:57:58 +0000 (17:57 -0700)

Trivial merge