Changes by: Aleksey Nogin (nogin at metaprl.org)
Date: 2007-08-06 15:50:13 -0700 (Mon, 06 Aug 2007)
Revision: 11870
Log message:

      - Merging the r11630 of the merge-branch script into merge-branch-simple:
         doc/html/{omake-,osh.,omake.}* are generated; all the other ones in
         doc/html are not.
     - Propagating the doc/html/changelog.html change from the 0.9.8.x