Merge: Clean stuff
authorJean Privat <jean@pryen.org>
Thu, 25 Sep 2014 13:10:33 +0000 (09:10 -0400)
committerJean Privat <jean@pryen.org>
Thu, 25 Sep 2014 13:10:33 +0000 (09:10 -0400)
A lot of small fixes and cleanups not really related.

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


Trivial merge