Merged Revisions 3100-3101 from stable branch.

tbrehm

2012-05-11 86985d07e25a39aece61599480673f791b512a06

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