Fix merge error in 1f98dbd.

This error caused some failing tests.
Merge branch 'master' of github.com:cappuccino/cappuccino