Steven Dake b7ee142c68 Merge trunk revision 2639: %!s(int64=16) %!d(string=hai) anos
..
Makefile.am 3b369ae17c merge trunk revision 2554: %!s(int64=16) %!d(string=hai) anos
generic.in b7ee142c68 Merge trunk revision 2639: %!s(int64=16) %!d(string=hai) anos