am 101aa2a0: Merge "Put Email back into eclipse .classpath"

* commit '101aa2a09bc8791fc814134ea40f97b0d9bacf25':
  Put Email back into eclipse .classpath