Merge branch 'telebt' into telescience
authorKeith Packard <keithp@keithp.com>
Wed, 11 May 2011 15:16:29 +0000 (08:16 -0700)
committerKeith Packard <keithp@keithp.com>
Wed, 11 May 2011 15:16:29 +0000 (08:16 -0700)

Trivial merge