Merged revisions 3845-3876 and 3879-3918 from stable branch.

hellkat

2013-03-26 cc65688b3da3e16729a1f73dd50fd975bd1ff741

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