[xulrunner] (5 commits) ...Merge branch 'master' of ssh://pkgs.fedoraproject.org/xulrunner

[Jan Horak]

Summary of changes:

  1b7aac2... fix bug in npapi.h causing compile failures (*)
  8737016... fix bug in npapi.h causing compile failures (*)
  f4329e2... Gnome 3 proxy honoured now: mozbz#682832 (*)
  67e28b0... Merge branch 'f16' of ssh://pkgs.fedoraproject.org/xulrunne (*)
  38d4b7e... Merge branch 'master' of ssh://pkgs.fedoraproject.org/xulru

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