-
Committer:
Andrew Starr-Bochicchio
-
Date:
2011-02-15 00:15:40 UTC
-
mfrom:
(709 bzr-gtk)
-
mto:
This revision was merged to the branch mainline in
revision
711.
-
Revision ID:
a.starr.b@gmail.com-20110215001540-ivb00xv8s8ma1vn1
Re-merge on trunk, resolving one conflict.