Merge branch 'scan-telemetry' into preload-maps
authorKeith Packard <keithp@keithp.com>
Sun, 17 Jul 2011 04:06:37 +0000 (21:06 -0700)
committerKeith Packard <keithp@keithp.com>
Sun, 17 Jul 2011 04:06:37 +0000 (21:06 -0700)

Trivial merge