Merge branch 'telemini' into telebt
authorKeith Packard <keithp@keithp.com>
Sat, 2 Apr 2011 02:35:22 +0000 (19:35 -0700)
committerKeith Packard <keithp@keithp.com>
Sat, 2 Apr 2011 02:35:22 +0000 (19:35 -0700)

Trivial merge