[bolzplatz2006/f17] (3 commits) ...Merge remote-tracking branch 'origin/master' into f17

[Hans de Goede]

Summary of changes:

  a97f264... - Resolves rhbz#794501 - Patch from Omair Majid <omajid at red (*)
  e1ab764... Fix bolzplatz2006 not running due to openjdk-1.7 no longer  (*)
  710b03b... Merge remote-tracking branch 'origin/master' into f17

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