Merge: Bugfixes for MacOSX
authorJean Privat <jean@pryen.org>
Mon, 3 Nov 2014 19:45:05 +0000 (14:45 -0500)
committerJean Privat <jean@pryen.org>
Mon, 3 Nov 2014 19:45:05 +0000 (14:45 -0500)
Some hot-bugfixes for MacOSX.

See the individual commits for the details.

Pull-Request: #865
Reviewed-by: Alexandre Terrasa <alexandre@moz-code.org>


Trivial merge