Merge branch 'ferret-removal'
authorRich Lane <rlane@club.cc.cmu.edu>
Sun, 7 Mar 2010 21:17:18 +0000 (13:17 -0800)
committerRich Lane <rlane@club.cc.cmu.edu>
Sun, 7 Mar 2010 21:17:18 +0000 (13:17 -0800)
commitba32d4c46e57b05564a5d52720bf9b533f2b4a2d
treed77f882578d95b054484052acfd64615786236d5
parentc7b3ec0578432db0b54cfe869d24b4046ff239d3
parent460ffbda8b655bf26e36403cd1069e35919734e4
Merge branch 'ferret-removal'
bin/sup
bin/sup-add