[MERGE] annotate on working tree with edits

[Alexander Belchenko]

Alexander Belchenko has voted comment.
Status is now: Semi-approved
Comment:
=== modified file 'bzrlib/annotate.py'
--- bzrlib/annotate.py  2007-09-19 08:15:41 +0000
+++ bzrlib/annotate.py  2007-09-21 05:25:32 +0000
@@ -32,20 +32,35 @@
...
+    :param tree: if non None, the tree to get the annotations from

^-- `if non None` -- is hard to read and pronounce. `if not None` -- 
could be used instead, or this is bad English?

For details, see: 
http://bundlebuggy.aaronbentley.com/request/%3C46F45F92.7080205%40internode.on.net%3E