Merge remote-tracking branch 'sourceforge/patches-2.0' into patches-2.0

Conflicts:
	include/event2/event.h

diff --cc include/event2/event.h
index b75f61d2b1f13c13bf26794c3200844032448ad9,1da95560349ae180c779057bb12bcf6c3e35bc4d..10bcd97c79ac4dda9c17903511a2afdbdf838fb2
--- 1/include/event2/event.h
--- 2/include/event2/event.h
+++ b/include/event2/event.h
@@@ -645,7 -645,7 +645,7 @@@ int event_base_set(struct event_base *
    This is a more flexible version of event_base_dispatch().
  
    By default, this loop will run the event base until either there are no more
-   pending or active, or until something calls event_base_loopbreak() or
 -  added events, or until something calls event_base_loopbreak() or
++  pending or active events, or until something calls event_base_loopbreak() or
    event_base_loopexit().  You can override this behavior with the 'flags'
    argument.