Merged revisions 2794-2804 from stable branch.

tbrehm

2011-12-07 6882ab1634ec66e621e8964428f741cd7d103a00

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