merge svn 348
google code wiki, autotranslated with script. may not be formatted perfectly.  original wiki files included in originalwiki/