svn diff -r1858..1861 > 2.7-branch.diff

=== modified file 'profiles/Makefile'
--- profiles/Makefile	2011-10-19 22:23:19 +0000
+++ profiles/Makefile	2012-01-03 22:45:00 +0000
@@ -56,6 +56,7 @@
                           ${PROFILES_DEST}/program-chunks \
                           ${PROFILES_DEST}/tunables \
                           ${PROFILES_DEST}/tunables/home.d \
+                          ${PROFILES_DEST}/tunables/multiarch.d \
                           ${PROFILES_DEST}/local
 	install -m 644 ${PROFILES_TO_COPY} ${PROFILES_DEST}
 	install -m 644 ${ABSTRACTIONS_TO_COPY} ${PROFILES_DEST}/abstractions

=== modified file 'profiles/apparmor.d/abstractions/python'
--- profiles/apparmor.d/abstractions/python	2011-11-30 16:56:45 +0000
+++ profiles/apparmor.d/abstractions/python	2012-01-03 20:23:30 +0000
@@ -31,4 +31,4 @@
   /usr/lib/wx/python/*.pth r,
 
   # python build configuration and headers
-  /usr/include/python{2,3}.[0-7]*/pyconfig.h
+  /usr/include/python{2,3}.[0-7]*/pyconfig.h r,

=== modified file 'profiles/apparmor.d/usr.sbin.smbd'
--- profiles/apparmor.d/usr.sbin.smbd	2011-11-01 17:28:49 +0000
+++ profiles/apparmor.d/usr.sbin.smbd	2011-12-30 20:55:58 +0000
@@ -21,6 +21,7 @@
   capability sys_tty_config,
 
   /etc/mtab r,
+  /etc/netgroup r,
   /etc/printcap r,
   /proc/*/mounts r,
   /proc/sys/kernel/core_pattern r,