daily autocommit

diff --git a/portage/package.use b/portage/package.use
index 804bb4296e7cf852b421d8e22c28a4cb6ba93568..980c21b96e5d5b75802ea12bef203fa164d97a5d 100644 (file)
--- a/portage/package.use
+++ b/portage/package.use
@@ -298,6 +298,7 @@ net-im/psi                          extras jingle
 net-libs/libpcap                        canusb
 net-libs/libssh2                       gcrypt
 net-libs/libvncserver                  gcrypt gnutls
+net-libs/telepathy-qt                  farstream
 net-libs/xulrunner                     system-sqlite wifi
 
 net-misc/curl                          libssh2

diff --git a/resolv.conf b/resolv.conf
index 1602b40a7262146e7c7ddc74ba35c13267ab40b2..9076c0f3da3f4315912ea6570cf46a80418639b3 100644 (file)
--- a/resolv.conf
+++ b/resolv.conf
@@ -1,7 +1,5 @@
-# Hand made by Frank Brehm
-domain home.brehm-online.com
-#search home.brehm-online.com brehm-online.com hennig-berlin.org uhu-banane.de pb.local dc1.pb.local dc2.pb.local
-search home.brehm-online.com brehm-online.com pb.local stage.pb.local dc1.de.profitbricks.net dc2.us.profitbricks.net dc3.de.profitbricks.net
-#nameserver 10.12.11.1
-nameserver 192.168.178.30
-nameserver 192.168.178.89
+# Generated by net-scripts for interface eth0
+domain brehm-online.com
+search home.brehm-online.com home.hennig-berlin.org brehm-online.com hennig-berlin.org uhu-banane.de
+#nameserver 10.12.11.254
+nameserver 127.0.0.1