Manual merge of commits
authorAlan T. DeKok <aland@freeradius.org>
Wed, 4 Aug 2010 13:29:48 +0000 (15:29 +0200)
committerAlan T. DeKok <aland@freeradius.org>
Wed, 4 Aug 2010 13:29:48 +0000 (15:29 +0200)
commit7480c9f55c5cc4655c22dbf00c4bcd837cd4e12d
treed9c36f3247b2ed98806c5129e8c6b10422161805
parentd330e8c7215e7b55f1baa98c940e6571cbac986b
Manual merge of commits

3d7e1b2a3f26d3d15617a86d2f663d0b435e88a3
1d980e559d842f5e3561b692672fa1feb8b936e8
src/main/event.c
src/main/listen.c