Merge "upstream" fixes from SIPB's snippets
authorAlex Dehnert <adehnert@mit.edu>
Mon, 6 Jun 2011 07:10:15 +0000 (03:10 -0400)
committerAlex Dehnert <adehnert@mit.edu>
Mon, 6 Jun 2011 07:10:15 +0000 (03:10 -0400)
commitaec307d9657dbff6bc8ffbf529fdf050c25b726c
tree0e86ce9885fc0010818a965c4c78be139fa54f5e
parent4df1aef48e58c3386a17591eac1fced9c55a4a8e
Merge "upstream" fixes from SIPB's snippets
__init__.py