Merge

diff --cc lisp/ChangeLog
index 4c78c9d,77cbdc0..ac6528d
--- 1/lisp/ChangeLog
--- 2/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@@ -1,7 -1,8 +1,12 @@@
 +2011-09-18  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 +
 +      * mm-decode.el (mm-inline-media-tests): Fix typo in regexp.
 +
+ 2011-09-19  Julien Danjou  <julien@danjou.info>
+ 
+       * auth-source.el (auth-source-netrc-parse): Use an obfuscation method
+       which work with things that are not ASCII.
+ 
  2011-09-17  Lars Magne Ingebrigtsen  <larsi@gnus.org>
  
        * mm-decode.el (mm-inline-media-tests): Support imagemagick images.