sync cvs as of 2013-05-16
sync cvs as of 2013-05-17
sync cvs as of 2013-05-18 (xfree->free)
sync cvs as of 2013-07-01
auth_info: remove var name from prototype
sync cvs as of 2013-07-01 (tests only)