Shahar:
This is the same patch as you posted, but I have rebased it on top of
current HEAD.
You'll have to do save the next email to a file, and do:
git reset --hard HEAD^
git pull
git am /path/to/saved_email
There are no changes in this patch, except what is needed to make it
compile. Will follow-up with comments.
Rich.