-
Committer:
John Arbash Meinel
-
Date:
2011-09-12 18:40:02 UTC
-
mfrom:
(6132 +trunk)
-
mto:
This revision was merged to the branch mainline in
revision
6133.
-
Revision ID:
john@arbash-meinel.com-20110912184002-o23eu21fdgp35h2q
Merge bzr.dev, resolve release-notes (aka NEWS) conflicts.