Merge branch 'pj/portable' into next

* pj/portable:
  Makefile tweaks: Solaris 9+ dont need iconv / move up uname variables
  Merge part of jc/portable branch
  git-mktree: reverse of git-ls-tree.
  Merge branch 'lt/merge-tree'
  Merge branch 'jc/ident'
  cherry-pick/revert: error-help message rewording.
  Fix fmt-merge-msg counting.

diff --cc Makefile
Simple merge

diff --cc git-fmt-merge-msg.perl
index a77e94eb5a8933cb43c8aa0707a7a345f14e97f5,3de67d779044ca0a9a511eded6929b3c33ddcd1f..c13af4884abc9371250687cb2ab25b66a91acc48
--- 1/git-fmt-merge-msg.perl
--- 2/git-fmt-merge-msg.perl
+++ b/git-fmt-merge-msg.perl
@@@ -60,14 -55,11 +60,14 @@@ sub current_branch 
  }
  
  sub shortlog {
-       my ($tip, $limit) = @_;
+       my ($tip) = @_;
        my ($fh, @result);
 -      open $fh, '-|', ('git-log', '--topo-order',
 -                       '--pretty=oneline', $tip, '^HEAD')
 -          or die "$!";
 +      my $pid = open($fh, '-|');
 +      die "$!" unless defined $pid;
 +      if (!$pid) {
-           exec('git-log', "--max-count=$limit", '--topo-order',
++          exec('git-log', '--topo-order',
 +               '--pretty=oneline', $tip, '^HEAD') or die "$!";
 +      }
        while (<$fh>) {
                s/^[0-9a-f]{40}\s+//;
                push @result, $_;