Resolve conflict caused by John Maddock and I editing at the same time. (No real conflict; CVS just got nervous.)

[SVN r8396]

libs/libraries.htm

@@ -123,8 +123,10 @@ are free decoders and encoders available for many, many different
 platforms. Many commercial compress/archive utilities also
 support this format.</p>
 
-<p>Hint: A Linux user reports his decoder first required renaming
-boost_all.zip to boost_all.ZIP.</p>
+<p>Unix/Linux hints: boost_all.zip is built on a Win32 platform, so the line
+endings are wrong for Unix/Linux.&nbsp; Use the -a option when unzipping with InfoZip
+for Unix/Linux friendly line endings.&nbsp; A Linux user also reports his decoder first required renaming boost_all.zip
+to boost_all.ZIP.</p>
 
 <h3>CVS archive</h3>