Fixed gcc 4.4.3 build problems.
Merge branch 'sam_97_alt' of github.com:rethinkdb/rethinkdb into sam_97_alt