Patches for 0.12

[Austin Clements]

Quoth myself on Mar 14 at  6:16 pm:
> Quoth David Bremner on Mar 10 at 10:09 am:
> > 
> > As usual, nothing brings out the bug reports like a freeze.
> > 
> > There are some patches that should probably go in, but could use one
> > more pair of eyes.
> > 
> >   id:"1330849538-24558-1-git-send-email-jani at nikula.org"
> 
> I looked at this and just sent a question to Jani
>   id:"87k42momyi.fsf at awakening.csail.mit.edu"
> If the answer is that it's okay, then consider my eyes one more pair.

Jani answered to my satisfaction, so I approve this patch.