Merge remote branch 'origin/master'
authorKeith Packard <keithp@keithp.com>
Tue, 20 Oct 2009 13:54:03 +0000 (22:54 +0900)
committerKeith Packard <keithp@keithp.com>
Tue, 20 Oct 2009 13:54:03 +0000 (22:54 +0900)

Trivial merge