Dan McGee 6513b0ba59 Merge branch 'maint' ... Conflicts: doc/Makefile.am		2012-01-02 19:44:00 -06:00
..
libalpm	Merge branch 'maint'	2012-01-02 19:44:00 -06:00