[vidalia/f12/master] (12 commits) ...Merge branch 'master' into f12

[Chen Lei]

Summary of changes:

  3d61c7e... Fix typo that causes a failure to update the common directo (*)
  c677948... *** empty log message *** (*)
  405d546... sync with upstream (*)
  3a00ef0... Add contrib to -doc subpackage (*)
  759f4a5... update to 0.2.8 (*)
  b47ac4a... fix DSOLinking (*)
  78f7d59... *** empty log message *** (*)
  e5600e6... *** empty log message *** (*)
  64072ff... dist-git conversion (*)
  fa2a8ca... Merge branch 'master' into f12
  3bd5196... Update to 0.2.10 (*)
  446bec3... Merge branch 'master' into f12

(*) This commit already existed in another branch; no separate mail sent