<?xml version="1.0" encoding="UTF-8"?>
<commit>
  <added type="array"/>
  <modified type="array">
    <modified>
      <diff>@@ -205,7 +205,7 @@ class Updater(object):
     self.FlushIfNeeded()
 
   def FlushIfNeeded(self):
-    if len(self.batch_feed.entry) &gt;= 25:   # could be 100 max; 50 timed out sometimes
+    if len(self.batch_feed.entry) &gt;= 15:   # 100 is max but too slow for App Engine
       self.Flush()
 
   def Flush(self):
@@ -470,6 +470,7 @@ class MergeGoogle(AddressBookerBaseHandler):
           # to get around App Engine long request deadlines.
           self.redirect('http://%s/gcontacts?key=%s&amp;continue=1' %
                         (settings.HOST_NAME, key))
+          return
 
 
     # Put the boring ones at bottom.</diff>
      <filename>addressbooker.py</filename>
    </modified>
  </modified>
  <removed type="array"/>
  <parents type="array">
    <parent>
      <id>bfbfcd50cd093d775cbb9003080bcb863697e94f</id>
    </parent>
  </parents>
  <author>
    <name>Brad Fitzpatrick</name>
    <email>brad@danga.com</email>
  </author>
  <url>http://github.com/bradfitz/addressbooker/commit/58351427d489405bf4e73c811458a3ea414bd44b</url>
  <id>58351427d489405bf4e73c811458a3ea414bd44b</id>
  <committed-date>2008-12-01T00:22:52-08:00</committed-date>
  <authored-date>2008-12-01T00:22:52-08:00</authored-date>
  <message>reduce limit further</message>
  <tree>672ed083dd31d4c34351541e9b1443e7050a0266</tree>
  <committer>
    <name>Brad Fitzpatrick</name>
    <email>brad@danga.com</email>
  </committer>
</commit>
