Merge upstream

diff --cc dulwich/pack.py
Simple merge

diff --cc dulwich/server.py
index 5d72c2156e9d884102992147c27aeeda85ba5877,fcd17495833b3a033a9b9ca48db37daf2eced559..c71bab98866d7ab904153f1126c71ad419e79db0
--- 1/dulwich/server.py
--- 2/dulwich/server.py
+++ b/dulwich/server.py
@@@ -103,12 -84,6 +84,10 @@@ class GitBackend(Backend)
  
          print "pack applied"
  
-     def generate_pack(self, want, have, write, progress):
-         progress("dul-daemon says what\n")
-         sha_queue = generate_pack_contents(want, have, self.repo.get_object) 
-         write_pack_data(ProtocolFile(None, write), (self.repo.get_object(sha) for sha in sha_queue), len(sha_queue))
-         progress("how was that, then?\n")
++    def fetch_objects(self, determine_wants, graph_waker, progress):
++        for sha in generate_pack_contents(determine_wants(), have, self.repo.get_object):
++            yield self.repo.get_object(sha)
 +
  
  class Handler(object):