Merge deprecation of Tree.entries.

diff --cc NEWS
index 77d8e09e8d139935974c47c3838a33f4f7e4384a,9a197a8621a3e76da80b619c12961cc4b75d35d6..2904f66cc906ff2efe721d18aa83df118f8ae84c
--- 1/NEWS
--- 2/NEWS
+++ b/NEWS
@@@ -18,10 -18,9 +18,13 @@@
  
   API CHANGES
  
 +  * The order of the parameters to Tree.add(name, mode, sha) has changed, and
 +    is now consistent with the rest of Dulwich. Existing code will still
 +    work but print a DeprecationWarning. (Jelmer Vernooij, #663550)
 +
+   * Tree.entries() is now deprecated in favour of Tree.items() and
+     Tree.iteritems(). (Jelmer Vernooij)
+ 
  0.7.0 2011-01-21
  
   FEATURES

diff --cc dulwich/objects.py
Simple merge

diff --cc dulwich/tests/test_objects.py
Simple merge