Merge from head
authorFaiyaz Ahmed <faiyaza@cs.princeton.edu>
Fri, 20 Jul 2007 19:44:11 +0000 (19:44 +0000)
committerFaiyaz Ahmed <faiyaza@cs.princeton.edu>
Fri, 20 Jul 2007 19:44:11 +0000 (19:44 +0000)
commitcd5f984659e84a7cc27f853c70b18f8297412e28
treebcaca14e3be552f8c348ef9b4619b8e066b6f28e
parentcb21c9e5a85a42e5e257cb749f49375bb73f51ac
Merge from head
sm.py