-
Committer:
John Arbash Meinel
-
Date:
2011-04-22 14:12:22 UTC
-
mfrom:
(5809 +trunk)
-
Revision ID:
john@arbash-meinel.com-20110422141222-nx2j0hbkihcb8j16
Merge newer bzr.dev and resolve conflicts.
Try to write some documentation about how the _dirblock_state works.
Fix up the tests so that they pass again.