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