Merge: Fix more warnings
authorJean Privat <jean@pryen.org>
Tue, 13 Jan 2015 01:28:35 +0000 (20:28 -0500)
committerJean Privat <jean@pryen.org>
Tue, 13 Jan 2015 01:28:35 +0000 (20:28 -0500)
And some more....

Pull-Request: #1008
Reviewed-by: Jean Privat <jean@pryen.org>
Reviewed-by: Lucas Bajolet <r4pass@hotmail.com>


Trivial merge