Dan McGee a35610beba Merge branch 'maint' ... Conflicts: lib/libalpm/be_local.c lib/libalpm/trans.c		2010-12-12 19:53:20 -06:00
..
libalpm	Merge branch 'maint'	2010-12-12 19:53:20 -06:00