merge changes from trunk

git-svn-id: https://nocs.stanford.edu/cgi-bin/svn.cgi/booksim2.0/branches/classes@3035 ce7aba0d-9f81-40a6-a495-cecae84b0515
merge changes from trunk

git-svn-id: https://nocs.stanford.edu/cgi-bin/svn.cgi/booksim2.0/branches/classes@3037 ce7aba0d-9f81-40a6-a495-cecae84b0515
merge changes from trunk

git-svn-id: https://nocs.stanford.edu/cgi-bin/svn.cgi/booksim2.0/branches/classes@3039 ce7aba0d-9f81-40a6-a495-cecae84b0515
merge changes from trunk

git-svn-id: https://nocs.stanford.edu/cgi-bin/svn.cgi/booksim2.0/branches/classes@3041 ce7aba0d-9f81-40a6-a495-cecae84b0515
merge changes from trunk

git-svn-id: https://nocs.stanford.edu/cgi-bin/svn.cgi/booksim2.0/branches/classes@3051 ce7aba0d-9f81-40a6-a495-cecae84b0515
merge changes from trunk

git-svn-id: https://nocs.stanford.edu/cgi-bin/svn.cgi/booksim2.0/branches/classes@3057 ce7aba0d-9f81-40a6-a495-cecae84b0515
merge changes from trunk

git-svn-id: https://nocs.stanford.edu/cgi-bin/svn.cgi/booksim2.0/branches/classes@3059 ce7aba0d-9f81-40a6-a495-cecae84b0515
merge changes from trunk

git-svn-id: https://nocs.stanford.edu/cgi-bin/svn.cgi/booksim2.0/branches/classes@3061 ce7aba0d-9f81-40a6-a495-cecae84b0515
merge changes from trunk

git-svn-id: https://nocs.stanford.edu/cgi-bin/svn.cgi/booksim2.0/branches/classes@3063 ce7aba0d-9f81-40a6-a495-cecae84b0515
merge changes from trunk

git-svn-id: https://nocs.stanford.edu/cgi-bin/svn.cgi/booksim2.0/branches/classes@3065 ce7aba0d-9f81-40a6-a495-cecae84b0515
merge changes from trunk

git-svn-id: https://nocs.stanford.edu/cgi-bin/svn.cgi/booksim2.0/branches/classes@3067 ce7aba0d-9f81-40a6-a495-cecae84b0515
merge changes from trunk

git-svn-id: https://nocs.stanford.edu/cgi-bin/svn.cgi/booksim2.0/branches/classes@3069 ce7aba0d-9f81-40a6-a495-cecae84b0515
extend and generalize the support for multiple traffic classes

git-svn-id: https://nocs.stanford.edu/cgi-bin/svn.cgi/booksim2.0/branches/classes@3070 ce7aba0d-9f81-40a6-a495-cecae84b0515
merge changes from trunk

git-svn-id: https://nocs.stanford.edu/cgi-bin/svn.cgi/booksim2.0/branches/classes@3076 ce7aba0d-9f81-40a6-a495-cecae84b0515
merge changes from trunk

git-svn-id: https://nocs.stanford.edu/cgi-bin/svn.cgi/booksim2.0/branches/classes@3080 ce7aba0d-9f81-40a6-a495-cecae84b0515
fix reply class functionality

git-svn-id: https://nocs.stanford.edu/cgi-bin/svn.cgi/booksim2.0/branches/classes@3081 ce7aba0d-9f81-40a6-a495-cecae84b0515
only print statistics that actually have any samples

git-svn-id: https://nocs.stanford.edu/cgi-bin/svn.cgi/booksim2.0/branches/classes@3082 ce7aba0d-9f81-40a6-a495-cecae84b0515
merge changes from trunk

git-svn-id: https://nocs.stanford.edu/cgi-bin/svn.cgi/booksim2.0/branches/classes@3084 ce7aba0d-9f81-40a6-a495-cecae84b0515
merge changes from trunk

git-svn-id: https://nocs.stanford.edu/cgi-bin/svn.cgi/booksim2.0/branches/classes@3097 ce7aba0d-9f81-40a6-a495-cecae84b0515
merge changes from trunk

git-svn-id: https://nocs.stanford.edu/cgi-bin/svn.cgi/booksim2.0/branches/classes@3160 ce7aba0d-9f81-40a6-a495-cecae84b0515