Steven Dake b2838454ef Merge trunk revision 2557: 16 lat temu
..
Makefile.am 3b369ae17c merge trunk revision 2554: 16 lat temu
generic.in b2838454ef Merge trunk revision 2557: 16 lat temu