Merge branch 'preload-maps'
authorKeith Packard <keithp@keithp.com>
Sun, 17 Jul 2011 15:17:44 +0000 (08:17 -0700)
committerKeith Packard <keithp@keithp.com>
Sun, 17 Jul 2011 15:17:44 +0000 (08:17 -0700)

Trivial merge