Dan McGee f8b689d48e Merge branch 'maint' ... Conflicts: lib/libalpm/dload.c po/it.po scripts/makepkg.sh.in		2009-01-02 22:48:52 -06:00
..
libalpm	Merge branch 'maint'	2009-01-02 22:48:52 -06:00