Merge remote-tracking branch 'origin/patches-2.0' Conflicts: evutil_rand.c Had conflicts with _EVENT_ -> EVENT__ change.
2012-05-31T02:52:37