[drbdlinks/el6] (4 commits) ...Merge remote branch 'origin/master' into el6

[Robert Scheck]

Summary of changes:

  6dda8eb... - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass (*)
  ef76483... - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass (*)
  63e83da... Upgrade to 1.22 (*)
  90c0316... Merge remote branch 'origin/master' into el6

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