commit 24116733568a6d146a427475daf4ac7c84606f51 Merge: f8ddc6b 2a78a42 Author: Conrad Meyer <cemeyer at cs.washington.edu> Date: Sun Jul 3 15:25:05 2011 -0700 Merge branch 'master' into f14 ---