[SCM] debian-live/config-webc branch, master, updated. 1f46931d5e8db5c91b17a55cbb04f730d22b0340

[Daniel Baumann]

The following commit has been merged in the master branch:
commit 1f46931d5e8db5c91b17a55cbb04f730d22b0340
Author: Daniel Baumann <daniel.baumann at progress-technologies.net>
Date:   Sun Jun 19 13:30:12 2011 +0200

    Correcting apt preferences for progress.

diff --git a/webconverger/config/chroot_apt/preferences b/webconverger/config/chroot_apt/preferences
index 01f9ac3..4202eb1 100644
--- a/webconverger/config/chroot_apt/preferences
+++ b/webconverger/config/chroot_apt/preferences
@@ -1,6 +1,11 @@
 Package: *
-Pin: release n=artax-backports
+Pin: release n=artax
 Pin-Priority: 999
+
 Package: *
-Pin: release n=artax
+Pin: release n=artax-security
+Pin-Priority: 999
+
+Package: *
+Pin: release n=artax-backports
 Pin-Priority: 999

-- 
debian-live/config-webc