Merge lp:~jdstrand/firefox/firefox-439484 into lp:firefox/3.5

[Jamie Strandboge]

[Alexander Sack (asac)]

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2009-09-30 09:57:11 +0000
+++ debian/changelog	2009-10-14 16:15:25 +0000
@@ -47,6 +47,7 @@
       for mailto:. Add commented section for using xterm and konsole
       - update debian/usr.bin.firefox-3.5
     + allow access to extensions directory (LP: #433128)
+    + allow access to /etc/mplayerplug-in.conf (LP: #439484)
 
  -- Fabien Tassin <[e-mail]>  Sat, 05 Sep 2009 19:30:29 +0200
 
 
=== modified file 'debian/usr.bin.firefox.apparmor.in'
--- debian/usr.bin.firefox.apparmor.in	2009-09-25 15:13:07 +0000
+++ debian/usr.bin.firefox.apparmor.in	2009-10-14 16:15:25 +0000
@@ -166,6 +166,9 @@
   # mozplugger
   /etc/mozpluggerrc r,
   /usr/bin/mozplugger-helper Uxr,
+
+  # mplayer plugin
+  /etc/mplayerplug-in.conf r,
   /usr/bin/mplayer Uxr,
 
   # java