# HG changeset patch
# User Paul Aurich <paul@darkrain42.org>
# Date 1295303850 0
# Node ID 4c44826251918b4522fa070ed30f1b2122380040
# Parent  84e9eb0ae4d5726e61cc425a715fc8ef1784a298# Parent  28b328da726927890967145b77da3a61b3754b44
merge of '0d389b1a3f186fbbea57629066032e0fe9b7a47d'
     and '3e1e394a5c30d86e26a1419fbfbc1af5d31dff09'

diff -r 84e9eb0ae4d5 -r 4c4482625191 libpurple/protocols/zephyr/Zinternal.c
--- a/libpurple/protocols/zephyr/Zinternal.c	Mon Jan 17 22:37:03 2011 +0000
+++ b/libpurple/protocols/zephyr/Zinternal.c	Mon Jan 17 22:37:30 2011 +0000
@@ -30,7 +30,6 @@
 #else
 #include <arpa/inet.h>
 #include <sys/socket.h>
-#include <utmp.h>
 #endif
 
 int __Zephyr_fd = -1;