Merge branch 'master' into skytraq
authorKeith Packard <keithp@keithp.com>
Sat, 10 Oct 2009 21:00:03 +0000 (14:00 -0700)
committerKeith Packard <keithp@keithp.com>
Sat, 10 Oct 2009 21:00:03 +0000 (14:00 -0700)

Trivial merge