am 49b53c0b: merge from froyo-plus-aosp

Merge commit '49b53c0b948595ac34a52daca5fc6ef6af336b94'

* commit '49b53c0b948595ac34a52daca5fc6ef6af336b94':
  added missing ether_aton and ether_ntoa