Dan McGee 3ad3077d8d Merge branch 'maint' ... Conflicts: src/pacman/callback.c		2008-02-24 01:22:07 -06:00
..
pacman	Merge branch 'maint'	2008-02-24 01:22:07 -06:00
util	testdb : add conflicts checking.	2008-01-23 20:12:50 -06:00