commit ac44ea9d975b6a87a0c4646a867e6daa22089d9a Merge: a76f645 ab1b016 Author: Zack Weinberg <zackw at panix.com> Date: Tue Jul 19 09:58:57 2011 -0700 Merge branch 'master' into more-protocols