Merge remote-tracking branch 'origin/maint-0.2.2'

Conflicts:
	configure.in

Conflict was between two pieces of configure.in logic added to the
same place.  Trivial.

diff --cc configure.in
index f3640cb721c5221b28f17e88847f4ddb985cdcac,52ea0940244cc0320f43e21a5193007277d95e81..824547c6d713e46e632854f73ada1310c01aef5f
--- 1/configure.in
--- 2/configure.in
+++ b/configure.in
@@@ -145,9 -118,12 +145,15 @@@ if test "$enable_local_appdata" = "yes"
              [Defined if we default to host local appdata paths on Windows])
  fi
  
 +AC_ARG_ENABLE(bufferevents,
 +     AS_HELP_STRING(--enable-bufferevents, use Libevent's buffered IO.))
 +
+ dnl check for the correct "ar" when cross-compiling
+ AN_MAKEVAR([AR], [AC_PROG_AR])
+ AN_PROGRAM([ar], [AC_PROG_AR])
+ AC_DEFUN([AC_PROG_AR], [AC_CHECK_TOOL([AR], [ar], [ar])])
+ AC_PROG_AR
+ 
  AC_PROG_CC
  AC_PROG_CPP
  AC_PROG_MAKE_SET