Minor changes to support no-encryption sessions.
Authored by: chrishypernetch 2012-01-06
Parent: [r186]
Child: [r188]