Merge branch 'maint'

* maint:
  builtin-apply: fix typo leading to stack corruption
  git-stash.sh: fix flawed fix of invalid ref handling (commit da65e7c1)
  builtin-merge.c: allocate correct amount of memory
  Makefile: do not set NEEDS_LIBICONV for Solaris 8
  rebase -i: remove leftover debugging
  rebase -i: proper prepare-commit-msg hook argument when squashing

diff --cc Makefile
Simple merge

diff --cc builtin-apply.c
Simple merge

diff --cc builtin-merge.c
index dcf898778202c3e4cfb249c1013a2bb59d8f7645,d0bf1fc1edb5fc7783669e4086210a521a3ab6e3..fa7c95472c984b0a8325aa61a75137c0a8c1e36e
--- 1/builtin-merge.c
--- 2/builtin-merge.c
+++ b/builtin-merge.c
@@@ -727,10 -656,10 +727,10 @@@ static int merge_trivial(void
        write_tree_trivial(result_tree);
        printf("Wonderful.\n");
        parent->item = lookup_commit(head);
-       parent->next = xmalloc(sizeof(struct commit_list *));
+       parent->next = xmalloc(sizeof(*parent->next));
        parent->next->item = remoteheads->item;
        parent->next->next = NULL;
 -      commit_tree(merge_msg.buf, result_tree, parent, result_commit);
 +      commit_tree(merge_msg.buf, result_tree, parent, result_commit, NULL);
        finish(result_commit, "In-index merge");
        drop_save();
        return 0;