Merge remote-tracking branch 'origin/patches-2.0' Conflicts: include/event2/buffer.h include/event2/thread.h include/event2/util.h
2011-07-05T14:38:21