Merge branch 'telescience-v0.2'
authorKeith Packard <keithp@keithp.com>
Sun, 24 Feb 2013 08:20:54 +0000 (00:20 -0800)
committerKeith Packard <keithp@keithp.com>
Sun, 24 Feb 2013 08:20:54 +0000 (00:20 -0800)

Trivial merge