Merge.

diff --cc ChangeLog
index 3434f8ddcba4ca5a723441c4563f615834868747,017783b38d98189e92b842b892c62578cea688a1..c3f63371f1b207277452046ee9d8fa6fd993883c
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,4 -1,6 +1,7 @@@
+ 
+   * Problem configuring (PKG_CHECK_MODULES) fixed by removal of "rpath" in 
+     support/libmemcached.pc.in (Thanks to Ross McFarland).
 +  * Added memcached_callback_get()/set()
    * First prototype of C++ interface
    * Updated docs for uint16_t changes in previous release