Merge commit '72be40490951d3f9d0ada16fcf5288d0c3306d88' * commit '72be40490951d3f9d0ada16fcf5288d0c3306d88': fix warnings that will show up with GCC 4.4 (in master)
Merge commit '72be40490951d3f9d0ada16fcf5288d0c3306d88' * commit '72be40490951d3f9d0ada16fcf5288d0c3306d88': fix warnings that will show up with GCC 4.4 (in master)