Merged revisions 2916-2941 from stable branch.

tbrehm

2012-02-22 dec0dfa3a81e23a5a123be56ae8b36e0f1ed9137

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