Merge branch 'maint'

Conflicts:
	lib/libalpm/be_sync.c
	lib/libalpm/db.c
	src/pacman/util.c

1 files changed, 1 insertions, 0 deletions

diff --git a/lib/libalpm/util.c b/lib/libalpm/util.c
index 660d4eb4..28cf8e51 100644
--- a/lib/libalpm/util.c
+++ b/lib/libalpm/util.c
@@ -34,6 +34,7 @@
 #include <time.h>
 #include <syslog.h>
 #include <errno.h>
+#include <limits.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <sys/wait.h>