Merge branch 'maint'

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

1 files changed, 1 insertions, 1 deletions

diff --git a/lib/libalpm/be_local.c b/lib/libalpm/be_local.c
index 82c1d591..788b3c6f 100644
--- a/lib/libalpm/be_local.c
+++ b/lib/libalpm/be_local.c
@@ -405,7 +405,7 @@ static int local_db_populate(pmdb_t *db)
 		 * http://kerneltrap.org/mailarchive/linux-btrfs/2010/1/23/6723483/thread
 		 */
 		est_count = 0;
-		while((ent = readdir(dbdir)) != NULL) {
+		while(readdir(dbdir) != NULL) {
 			est_count++;
 		}
 		rewinddir(dbdir);