Merged revisions 2886-2909 from stable branch.

tbrehm

2012-01-25 355efb9a7f74a2035f595bbd0d03375710d08587

1
ALTER TABLE `shell_user` CHANGE `ssh_rsa` `ssh_rsa` TEXT CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT '';