Merge branch 'master' into xsession-support.

This includes the git-update fix.

kdesrc-build

@@ -864,7 +864,7 @@ EOF
 
         # Trailing space adds the appropriate LWP info since the resolver is not
         # my custom coding anymore.
-        $ua->agent("kdesrc-build $versionNum ");
+        $ua->agent("kdesrc-build/$versionNum ");
 
         if ($proxy) {
             whisper ("Using proxy $proxy for FTP, HTTP downloads");
@@ -2814,7 +2814,7 @@ EOF
         # Download updated objects. This also updates remote heads so do this
         # before we start comparing branches and such.
         info ("Downloading updates for g[$module]");
-        if (0 != log_command($module, 'git-fetch', ['git', 'fetch', '-t', $remoteName])) {
+        if (0 != log_command($module, 'git-fetch', ['git', 'fetch', $remoteName])) {
             die "Unable to perform git fetch for $remoteName, which should be $cur_repo";
         }