[cxxtest/el6] (5 commits) ...merge with master

[Martin Gieseking]

Summary of changes:

  f5710da... Fix typo that causes a failure to update the common directo (*)
  e07e9ea... dist-git conversion (*)
  ff51b82... - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass (*)
  c56bc5a... fix handling of GetoptError objects (bug #768869) (*)
  3036ec6... merge with master

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