[cherokee/el6] (4 commits) ...Merge branch 'master' into el6

[Pavel Lisý]

Summary of changes:

  4f1cd61... - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass (*)
  d77f272... Resolves bz 786748 - systemd service script seems broken (*)
  aa61a36... Resolves bz 786748 - systemd service script seems broken (*)
  bbd3cbb... Merge branch 'master' into el6

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