[midori/f16] (4 commits) ...Merge remote-tracking branch 'origin/master' into f16

[Kevin Fenzi]

Summary of changes:

  7910e92... - Rebuilt for glibc bug#747377 (*)
  6eb7a29... Update to 0.4.2-1 (*)
  ee23b36... Remove smp_mflags for now as we run into a build hang with  (*)
  4dd427a... Merge remote-tracking branch 'origin/master' into f16

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