Teach merge-graph.py to allow multiple annotations on the same node, and make some minor formatting changes.
Teach merge-graph.py to allow multiple annotations on the same node, and
make some minor formatting changes.

git-svn-id: f8a4e5e023278da1e04e203c7fe051e3c4285d88@1239652 13f79535-47bb-0310-9956-ffa450edef68

YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion