Merge branch 'master' into 0.9.x

author Brion Vibber <brion@pobox.com>

Wed, 8 Dec 2010 23:01:25 +0000 (15:01 -0800)

committer Brion Vibber <brion@pobox.com>

Wed, 8 Dec 2010 23:01:25 +0000 (15:01 -0800)
author Brion Vibber <brion@pobox.com>
Wed, 8 Dec 2010 23:01:25 +0000 (15:01 -0800)
committer Brion Vibber <brion@pobox.com>
Wed, 8 Dec 2010 23:01:25 +0000 (15:01 -0800)
diff --cc plugins/Mapstraction/MapstractionPlugin.php
Simple merge
author	Brion Vibber <brion@pobox.com>
	Wed, 8 Dec 2010 23:01:25 +0000 (15:01 -0800)
committer	Brion Vibber <brion@pobox.com>
	Wed, 8 Dec 2010 23:01:25 +0000 (15:01 -0800)