Merged revisions 2812-2883 from staböe branch.

tbrehm

2012-01-12 8cf78b31b28b9183579c7939b947e1f7e9f5c2fa

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