dederping code :)
Merge branch 'master' of https://github.com/raynorpat/cake2