Merge branch 'master' of ssh://repo.or.cz/srv/git/phpmyadmin/lorilee into gsoc

Conflicts:
	libraries/display_export.lib.php

js/functions.js

@@ -1726,6 +1726,13 @@ $(document).ready(function(){
         return false;
     });
     $('#sqlquery').focus();
+    if ($('#input_username')) {
+        if ($('#input_username').val() == '') {
+            $('#input_username').focus();
+        } else {
+            $('#input_password').focus();
+        }
+    }
 });
 
 /**