Merge branch 'master' of ../sipb-www/doc/ trac-import
authorGreg Price <price@mit.edu>
Sun, 1 Feb 2009 07:45:33 +0000 (02:45 -0500)
committerGreg Price <price@mit.edu>
Sun, 1 Feb 2009 07:45:33 +0000 (02:45 -0500)

Trivial merge