merging fixes to trunk. set version to 1.2.2.8120

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8120 3807eeeb-6ff5-0310-8944-8be069107fe0

cake/VERSION.txt

@@ -6,4 +6,4 @@
 // +---------------------------------------------------------------------------------------------------+ //
 ///////////////////////////////////////////////////////////////////////////////////////////////////////////
 
-1.2.1.8004
+1.2.2.8120

cake/config/config.php

@@ -22,5 +22,5 @@
  * @lastmodified  $Date$
  * @license       http://www.opensource.org/licenses/mit-license.php The MIT License
  */
-return $config['Cake.version'] = '1.2.1.8004';
+return $config['Cake.version'] = '1.2.2.8120';
 ?>