Fixing the 'no speak' problem
Merge branch 'master' of git://github.com/scoundrels/scrib
Updated barf to 1.2
Fixing merge