bug#16378: bug#16694: bugs #16694/#16378: Patches

[Eli Zaretskii]

> Date: Sat, 12 Apr 2014 13:37:11 +0200
> From: Matthias Dahl <matthias.dahl@binary-island.eu>
> CC: gundaetiapo@gmail.com, cs.mlists+bug-gnu-emacs@mailbox.org, 
>  16694-done@debbugs.gnu.org, 16434-done@debbugs.gnu.org, 
>  16378-done@debbugs.gnu.org
> 
> Hello Eli...
> 
> Since the pretest is due today, if you get the time, could you apply
> those pending patches? Thanks a lot in advance.

Done.

(Your changes to the trunk didn't compile, so I fixed them.)