Merge branch 'master' of /afs/sipb.mit.edu/project/sipb-www/wiki
authorsipb-www <sipb-www@bees-knees.mit.edu>
Sun, 11 Oct 2009 02:34:21 +0000 (22:34 -0400)
committersipb-www <sipb-www@bees-knees.mit.edu>
Sun, 11 Oct 2009 02:34:21 +0000 (22:34 -0400)

Trivial merge