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

Trivial merge