--- /dev/null
+commit ca9c3c2670beb338817aea7ca488dd040b517905
+Author: S.Çağlar Onur <caglar@cs.princeton.edu>
+Date: Thu Jan 13 14:56:05 2011 -0500
+
+ sync with SVN
+
+diff --git a/ip/iptunnel.c b/ip/iptunnel.c
+index d30e008..8111799 100644
+--- a/ip/iptunnel.c
++++ b/ip/iptunnel.c
+@@ -22,6 +22,7 @@
+ #include <net/if_arp.h>
+ #include <linux/ip.h>
+ #include <linux/if_tunnel.h>
++#include <linux/if_ether.h>
+
+ #include "rt_names.h"
+ #include "utils.h"