Dan McGee 11fb9c7674 Merge branch 'maint' ... Conflicts: lib/libalpm/trans.c src/pacman/query.c		2011-05-19 17:17:32 -05:00
..
pacman	Merge branch 'maint'	2011-05-19 17:17:32 -05:00
util	Merge branch 'maint'	2011-04-05 00:49:30 -05:00