Merge remote-tracking branch 'core/master' into engine-pu

* core/master: (47 commits)
  Fix -rpath for macosx
  Do the monotonic clock ourselves
  Use a monotonically increasing timer
  t/issue_140.t waffle-fails. Make it not do that.
  Immediately expire negative exptime for asciiprot
  fix memcached-tool to print about all slabs
  Properly daemonize memcached for debian
  Don't permanently close UDP listeners on error
  adjust clean-whitespace to match t/whitespace
  Allow memcached-init to start multiple instances
  remove ancient release file
  Issue 214: Search for network libraries before searching for libevent
  Issue 213: Search for clock_gettime in librt
  Issue 115: accont for CAS in item_size_ok
  Fix incredibly slim race for maxconns handler
  Fix whitespace bug in configure.ac
  Issue 183 - Reclaim items dead by flush_all
  Issue 200: Don't fire dtrace probe as the last thing in a function
  Gcc on Solaris sparc wants -R and not -rpath
  Issue 121: Set the runtime path when --with-libevent is used
  ...

Conflicts:
	configure.ac
	daemon/memcached.c
	daemon/memcached.h
	daemon/thread.c
	devtools/clean-whitespace.pl
	engines/default_engine/items.c
	engines/default_engine/slabs.h
	programs/testapp.c
	t/binary.t
	t/issue_140.t
	t/stats.t
	utilities/util.c

0 files changed, 0 insertions, 0 deletions