Commit e91d57f1f61a64842743cd3fc946493f8a963574
2011-08-08T16:20:53
Merge remote-tracking branch 'github/21_split_functions' Conflicts: event.c The conflicts were with the 21_faster_timeout_adj branch, which added a "reinsert" function that needed to get renamed to "reinsert_timeout". Also, some of the code that 21_split_functions changes got removed by 21_faster_timeout_adj.