# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: ph.wolfer@googlemail.com-20090203020133-\
#   5cfrisvvyzw7kwji
# target_branch: bzr+ssh://phw@bazaar.launchpad.net/%7Edo-plugins/do-\
#   plugins/trunk/
# testament_sha1: f347b37f4b6582165cf5a29511e243229cbe1b7c
# timestamp: 2009-02-03 03:01:47 +0100
# base_revision_id: djsiegel@gmail.com-20090202172903-zwm37xs22hljn5bx
# 
# Begin patch
=== modified file 'GoogleMaps/GoogleMaps.mdp'
--- GoogleMaps/GoogleMaps.mdp	2009-01-17 23:17:09 +0000
+++ GoogleMaps/GoogleMaps.mdp	2009-02-03 02:01:33 +0000
@@ -25,6 +25,7 @@
     <ProjectReference type="Gac" localcopy="True" refto="System.Core, Version=3.5.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
     <ProjectReference type="Gac" localcopy="True" refto="Do.Universe, Version=0.8.0.0, Culture=neutral, PublicKeyToken=null" />
     <ProjectReference type="Gac" localcopy="True" refto="Do.Platform, Version=0.8.0.0, Culture=neutral, PublicKeyToken=null" />
+    <ProjectReference type="Gac" localcopy="True" refto="System.Web, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
   </References>
   <GtkDesignInfo />
 </Project>
\ No newline at end of file

=== modified file 'GoogleMaps/src/MapAction.cs'
--- GoogleMaps/src/MapAction.cs	2008-12-24 05:48:33 +0000
+++ GoogleMaps/src/MapAction.cs	2009-02-03 02:01:33 +0000
@@ -20,6 +20,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Web;
 using Mono.Unix;
 
 using Do.Universe;
@@ -129,8 +130,7 @@
 		
 		string GoogleMapsURLWithExpression (string e)
 		{
-			return "http://maps.google.com/maps?q=" + (e ?? "")
-				.Replace (" ", "+");
+			return "http://maps.google.com/maps?q=" + System.Web.HttpUtility.UrlEncode(e ?? "");
 		}
 		
 		bool ContactSupportsAddress (ContactItem item)

# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWXI8CW4AAjLfgEAwUW////vq
X4C////wUATZV5qul3Ltuh26607hJJNFPINMp6NTyTMgk8psTRPIQDRtRkyCSSmAYiYKaelPUyNN
P1TJ6gaGT1DQAeoEkIQg00ajE00jyaR6QDTTRpppiNABzAmJoMJkyZMjCYJppkYmAIYBJU9E0000
JGZNUfqQPSPU0epmo2kZGQAGkRBbmv4OPiGXfTsM+eJpkywtonm0ymhcRqx1Um+SmAyqfk7/vPOj
5GUYZmZTzC/EqXp1axdbOLmyu3ZyHJ29sef88+fykPOn2HuBz7r6u+IzMpWHsK9Hu/VPR7dWi3py
dF68811eUbE8ct1wEpaYSJsL8vgaut6uPxmfw/fIxdlL3MaFpQaNK9LOiFTFTOmluKccyRh0KULy
DhiCs4XOJGyQ5aIgreTRwT+jSkGNTAagHJDKsWI5OAzLCqBB4nliXAp2OBQVIPo8EzDvV8qAuoBl
HDUKZPnngmYnN9Ldsgdp8N5YVEgOtSN62xwjSqzrWxzEVeQHxFxrmWD6ZDttCQXCReQYWxO1vzM7
qxKo0aCscatFEqKGxJFStYFEyTFbAUT8hikk8ZvIoJwP0uPOXDmJEydxCciSnsaazMSvZAkkNpBk
cXGVM2p5bbiMdIZWi1zWDVeC0hXaYHKnnEBE5KMVYK4awvHMW15FIWjF5UYETBxOuVAOKizQTC7v
AeKGTRWhA0zFSNRUOLI8RaX78IKAyFFXRMFDZyZ00HIR5362RsycyyB0FSiHjJ3FvAZvBhd7HZgq
U0Yzlq69r32hpGTDse4IsEEnJs8dXHL271jQRkryjJmbtreq/Cejx3RY3RZ+tEoL3ey13TX0sHHd
D3ZpWMt0C2YINYx0ajwnpYgx4iSO1C4OxOmUGBp5uUYMy2G98qD3hXDfMHHH26yowl83ESRvN56i
NMTjnUtoFmMiJzjBYeHdWOM7i14EU1X4ccpm5JU53VKeDHSvjIrvyHKoCAbElWXHURHPwIcygKqC
52ZlUReVKyY6IFimJHaMhhJDZ1zNRIrfA2+I8zWqRGnEeXjvIPuv1zx9bc6erFEFwl8rHBMLhfRR
TceI30QHs4K5isL0DIG+HMj0hz5PvpLbO+4TqsRHgXibTGTsrQIvjnUJ1bEoVrwiXIO1kG77Nyv2
IMrswp3Tv9eKfJuMQmFE/RW1PulfURqVeqtCyi1xKjYi/Ndu7e7NDHFImQRz7kDAdZB6wjsfVn7A
HqYKx+SIbgNYyFIPQrnvK8GKKCgFWI7bXkMlt2Y9F0kkOxPErEz06IMB09DnMNOtFXYpN2vU2GcJ
OVVUkjmTLEyOBPV3O9ENN+yjrraiGYTLm269r37CMlTxJ3+7c0E4A9C0297AqBSwRYty8OpRjd6e
uE+CfH01OluwDKyzKHMu62ZHLmNAMXbJq9MsUo2AV2RfuAyZkJpEXO0tr6n0TAfyG+Uiy1TT9e4D
7yWJ9nZRgiPTRVIZjzv3MRn3VsMHKo6Z4Bp6o0mwLVarqBgZEhOE+O6szbmTxUge72zab3GF5gEW
ZWQlsCh+JccspMmzqQ9VmLqWKWCrbxhG2eZodu8uXUczTVXcb7zlv3mlMg1HxKgKQOcCOYFTlwQd
B9FhuxVTFWVPbxUKMKppwOah2uCKDfB7rCBGrJVTI2oCRf8XckU4UJByPAlu