Fixed compile errors under llvm-gcc-4.2 (OSX 10.8).
Merge pull request #1162 from abalkin/compile-error

Fixed compile errors under llvm-gcc-4.2 (OSX 10.8).
Merge remote-tracking branch 'upstream/master'