Dan McGee 0ff52b6845 Merge branch 'maint' ... Conflicts due to change in return calling style. Conflicts: src/pacman/pacman.c src/pacman/sync.c		2011-03-21 07:53:13 -05:00
..
libalpm	Merge branch 'maint'	2011-03-21 07:53:13 -05:00