Merge fixes up to GIT 1.0.4

diff --git a/git-format-patch.sh b/git-format-patch.sh
index 01508e3b04f91bba3e960eb74eaff3e349e209bd..daa3caea778e13e946c4ffe53c876f5222ce7dfe 100755 (executable)
--- a/git-format-patch.sh
+++ b/git-format-patch.sh
@@ -210,6 +210,8 @@ Date: '"$ad"
        }
 
        mailScript="$mailScript"'
+       a\
+
        : body
        p
        n