compositeproto: Changes to 'master'

[Alan Coopersmith]

 .gitignore         |    1 +
 compositeproto.txt |   17 +++++++----------
 2 files changed, 8 insertions(+), 10 deletions(-)

New commits:
commit bca9592612d60142e3c624b90649475b561b8eda
Author: Alan Coopersmith <alan.coopersmith at sun.com>
Date:   Tue Apr 17 20:48:18 2007 -0700

    Add *~ to .gitignore to skip emacs/patch droppings

commit 6acacb52efd6f0927c9b82fe864f17623e7dc8c2
Author: Alan Coopersmith <alan.coopersmith at sun.com>
Date:   Tue Apr 17 20:47:50 2007 -0700

    Protocol spec nit cleanups
    
    Fix versioning from 0.3/0.4 merge
    Update description of RedirectWindow to match names in protocol diagrams