added changes from the re-tagged CodeIgniter 2.2.0 release.

dirty.