Merged revisions 3536-3555 from 3.0.5 stable branch.

tbrehm

2012-10-16 a008884b8f041577d43675f13c492f45fb9ee066

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