-
Committer:
John Arbash Meinel
-
Date:
2011-04-07 10:36:24 UTC
-
mfrom:
(5764 +trunk)
-
mto:
This revision was merged to the branch mainline in
revision
5766.
-
Revision ID:
john@arbash-meinel.com-20110407103624-n76g6tjeqmznwdcd
Merge bzr.dev 5764 to resolve release-notes (aka NEWS) conflicts