Merge remote-tracking branch 'savannah/emacs-24' into emacs-24-mac
Apply ftp://ftp.math.s.chiba-u.ac.jp/emacs/emacs-24.3-mac-4.1.tar.gz
Merge branch 'patch-mac-4.1' into emacs-24-mac
Merge branch 'emacs-24-mac' of github.com:nanasess/emacs into emacs-24-mac

Conflicts:
	src/macappkit.h
	src/macappkit.m