pop

diff --git a/meta b/meta
index c65b00ba6463307ea32bdf96445775b836958c5b..8544ab061877ed494a8344f3f51a08cea9baabfb 100644 (file)
--- a/meta
+++ b/meta
@@ -1,6 +1,6 @@
 Version: 1
-Previous: 46f5ee858aeb631b3c7f6f200cf925dece063962
-Head: 558e5577364aec3531c54b28def6e16f0c926524
+Previous: 3da43f61d55d0145547221b231522a492bb3af35
+Head: d293d2201524057a6dddbd641b9add2719fa9955
 Applied:
   logging: 549692c49922dce3911d97dcc6d0a2fc583ab5f7
   acm_snoop: dd5542fbaa1c5a92367d0552ef3525d5ea0a4638
@@ -9,8 +9,8 @@ Applied:
   dist-cfg: d2901f9410f4d3d57629189a4ff51571bb3b0cf3
   lower_retries: 25005d0475638542ab125b42d439d853c185402a
   locking: 558e5577364aec3531c54b28def6e16f0c926524
+  verbose: d293d2201524057a6dddbd641b9add2719fa9955
 Unapplied:
-  verbose: f134178acabc80b0d243a84ea37d997285405c21
   acme_verbose: 45cba0846874c93ef7af156bf0afe59f43d82ea6
   1.0.4: 9f452b8e59adb21b90fbdda980d25a54d4360d37
 Hidden:

diff --git a/patches/verbose b/patches/verbose
index 0c6a51077eaf5caa09e388eeae8b0d6a6e0f361d..9b5dd733c9c635bc5218319d8ae6deae0ce68268 100644 (file)
--- a/patches/verbose
+++ b/patches/verbose
@@ -1,5 +1,5 @@
-Bottom: 32588281780667752a506dba6c2782233250df24
-Top:    1cfc99531a549c8306d14dafeeec358fcff76c2a
+Bottom: 2895e38b888c2de8c2681ec086046cb241282cc2
+Top:    a2ee01245adbca4121dd5221ed9b3f3f04683d5d
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2010-12-03 12:52:49 -0800
 
@@ -39,11 +39,11 @@ index 2cb422a..9477d29 100644
        }
        ret = 0;
 diff --git a/src/acm.c b/src/acm.c
-index c503013..3a5404a 100644
+index a680b0b..9888387 100644
 --- a/src/acm.c
 +++ b/src/acm.c
-@@ -38,7 +38,6 @@
- #include <arpa/inet.h>
+@@ -39,7 +39,6 @@
+ #include <sys/types.h>
  #include <sys/stat.h>
  #include <sys/time.h>
 -#include <fcntl.h>