Merge lp:~ubuntu-branches/ubuntu/oneiric/gdm-guest-session/oneiric-201106210806 into lp:ubuntu/oneiric/gdm-guest-session

[James Westby]

The package history in the archive and the history in the bzr branch differ. As the archive is authoritative the history of lp:ubuntu/oneiric/gdm-guest-session now reflects that and the old bzr branch has been pushed to lp:~ubuntu-branches/ubuntu/oneiric/gdm-guest-session/oneiric-201106210806. A merge should be performed if necessary.

=== modified file 'debian/changelog'
--- debian/changelog	2011-06-21 09:42:57 +0000
+++ debian/changelog	2011-06-21 08:11:38 +0000
@@ -1,3 +1,4 @@
+<<<<<<< TREE
 gdm-guest-session (0.26) oneiric; urgency=low
 
   * apparmor/gdm-guest-session: Allow guest programs to read every file in
@@ -9,6 +10,19 @@
 
  -- Martin Pitt <[e-mail]>  Tue, 21 Jun 2011 09:42:57 +0200
 
+=======
+gdm-guest-session (0.26) UNRELEASED; urgency=low
+
+  * apparmor/gdm-guest-session: Allow guest programs to read every file in
+    /proc/*, as they are mainly having general system state.
+  * apparmor/gdm-guest-session: Allow guest programs to read /proc/asound/*
+    (for pulseaudio).
+  * apparmor/gdm-guest-session: Drop deny rule introduced in previous upload,
+    it does more than intended and breaks Firefox.
+
+ -- Martin Pitt <[e-mail]>  Tue, 21 Jun 2011 09:41:52 +0200
+
+>>>>>>> MERGE-SOURCE
 gdm-guest-session (0.25) oneiric; urgency=low
 
   * apparmor/gdm-guest-session: Allow reading /proc/filesystems and