Former-commit-id: b14137eaaf
b14137eaaf
a3c17ec2eb
small changes to make it compile with gcc 4.7 Former-commit-id: 5c81bd50ff
5c81bd50ff