Merge branch 'master' of ssh://sunjammer.codewiz.org/~/wiki/git/wiki

diff --combined memo/benchmark/compression
index 9e5ae4716fb2c51cd9951ba8075d80969835bb56,498d48c16c44deb1061f020eb075b29ef674b9db..8a087606d53f870fd99cd1e6989e10345c4b1abf
--- 1/memo/benchmark/compression
--- 2/memo/benchmark/compression
+++ b/memo/benchmark/compression
@@@ -2,6 -2,13 +2,13 @@@
  
  === Lossless compression algorithms ===
  
+ {{{
+ time lzop  <file >/dev/null
+ time gzip  <file >/dev/null
+ time bzip2 <file >/dev/null
+ time xz    <file >/dev/null
+ }}}
+ 
  || **Hostname** || **System**     || ** CPU Brand**              || **CPU** ||**Clock**||**Arch**||
  || r2d2         || PowerEdge R410 || Intel(R) Xeon(R) CPU        ||   E5520 || 2.27GHz || x86_64 ||
  || ummak        || Lenovo Laptop  || Intel(R) Core(TM)2 Duo CPU  ||   T9300 || 2.50GHz || x86_64 ||
@@@ -19,14 -26,12 +26,14 @@@
  || buildslave4  || XEN            || AMD Quad-Core Opteron       ||  2347HE || 1.90GHz || x86_64 ||
  || giskard      || Lenovo x200s   || Intel(R) Core(TM)2 Duo CPU  ||   U9300 || 1.20GHz || x86_64 ||
  || loongson     || Yeelong        || MIPS                        ||         ||         || mipsel ||
 +|| dfarning     || IdeaPad Y650   || Intel(R) Core(TM)2 Duo CPU  ||   P8700 || 2.53GHz || x86_64 ||
  
  ==== Time (seconds) ====
  
  || **hostname** ||**lzop**||**gzip**||**bzip2**||**lzma** || **xz**  ||**index**||
  || r2d2         ||  3.896 ||  9.029 ||  37.652 ||  84.727 ||  84.554 ||        ||
  || ummak        ||  3.790 ||  9.231 ||  36.311 ||  94.530 ||         ||  2.247 ||
 +|| dfarning     ||  4.041 ||  9.963 ||  42.631 || 104.108 || 105.507 ||        ||
  || groucho      ||  4.259 || 12.394 ||  56.541 || 158.497 ||         ||        ||
  || asus-m2avm   ||  4.101 || 10.104 ||  66.804 || 201.453 ||         ||        ||
  || triton       ||  4.445 || 11.363 ||  58.886 || 107.545 ||         ||        ||
@@@ -47,7 -52,7 +54,7 @@@
   * test file is a 175MB avi (southpark_12x12_about_last_night.avi)
   * all targets using 1 core only!
   * The MB/s figure refers to trinity
 - * "index" is a performance index relative to trinity
 + * "index" is a performance index relative
   * bender and trinity run same lzma version
   * is xz faster or slower than lzma?