am 874563f9: Merge "Fix generic build on Max OS X 10.7 Lion"

* commit '874563f92e18d54d9088408104cc28d35971f189':
  Fix generic build on Max OS X 10.7 Lion