am 0dd85d89: (-s ours) Only apply permission to files with +x (do not merge)

Merge commit '0dd85d89fa90de0d79da296292f75ceb5cf48b92' into eclair

* commit '0dd85d89fa90de0d79da296292f75ceb5cf48b92':
  Only apply permission to files with +x (do not merge)