~loggerhead-team/loggerhead/trunk-rich

Committer: John Arbash Meinel
Date: 2011-02-10 01:57:32 UTC
mfrom: <a title="Merged From 425" href="/~loggerhead-team/loggerhead/trunk-rich/revision/425?remember=128.6.36">(425 trunk)
mto: This revision was merged to the branch mainline in revision 426 .
Revision ID: john@arbash-meinel.com-20110210015732-b3kkt1jp7bsqcv0v

Merge loggerhead trunk back into load-test to resolve
__init__.py conflicts from Jelmer's update.

added added

removed removed