Merge remote branch 'origin/master'

diff --cc ChangeLog
index c895655bdf04a8ba7e17c37008ee436b1c8610f0,44d0f47b8d8e8c19e4125a370b18ac911463e546..448393fefa87fbd48bc3c46374eb8f16d5b28cc1
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,10 -1,9 +1,16 @@@
 -2010-09-31  Charles Wilson  <libtool@cwilson.fastmail.fm>
 +2010-09-02  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 +
 +      tests: avoid spurious test failure due to library mode on HP-UX.
 +      * tests/help.at (debug tracing): Use $lt_INSTALL not cp for
 +      install mode, the latter will not overwrite an existing library
 +      with mode 555.
 +
++2010-09-01  Charles Wilson  <libtool@cwilson.fastmail.fm>
+ 
+       Path conversion documentation
+       * doc/libtool.texi (Platform quirks): Add new subsections
+       'Cross compiling' and 'File name conversion'.
+ 
  2010-09-01  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
  
        tests: avoid spurious pic_flag test failure on HP-UX 10.20.