Merge commit 'origin/master'
authorroot <root@cassidy.cs.princeton.edu>
Tue, 8 Mar 2011 13:35:48 +0000 (08:35 -0500)
committerroot <root@cassidy.cs.princeton.edu>
Tue, 8 Mar 2011 13:35:48 +0000 (08:35 -0500)
commit5d9d4374df91f919e5c744906186b2769b6d09ae
tree9b322fd2943519232cad02222cc714891822d77f
parent223af3cec299c74f5d471a97fbae777e5ecf1fe5
parentac30052c985f7088999a29611f86f534325e3045
Merge commit 'origin/master'
sface/mainwindow.py
sface/screens/mainscreen.py