am 7a8671bc: Merge from gingerbread

* commit '7a8671bc57b163ae8950a1876a4707c33790904b':
  Fix the maddr issue for proxy authentication.