Merged Revisions 3771-3801 from stable branch.

tbrehm

2013-02-12 72695f0356210b5ca68d33d09e91c00ed9d6c2b6

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