Merging bzr://gaz.tangent.org/libmemcached/build/ to Build branch

diff --combined ChangeLog
index 7f6ed6f4471bc2fe71d8fa20668372fa705eb4d1,4de2dd4742ddc9562e708a1c1fc54933bb7ca6be..d5b5b009f07c6bdfc83d23fe0fa9e6c26898a7a5
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -2,6 -2,7 +2,7 @@@
  * Fixes for gcc 4.7, lp:961812
  * Fix for restart issue that happens under testing.
  * Fix for lp:962815.
+ * Support for transparent AES encryption.
  
  1.0.5 Tue Mar 13 22:56:47 PDT 2012
  * Fixes for OSX.
@@@ -51,7 -52,6 +52,7 @@@
   * memcached_fetch_result() now uses the internal result when available (about 25 to 50% faster).
   * Fix for stats structure.
   * Updates to documentation.
 + * memcached_fetch_result() now uses the internal result when available (about 25 to 50% faster).
  
  0.49 Thu Apr 14 08:43:37 PDT 2011
    * Fix calls to auto methods so that if value is not passed in nothing bad happens.
@@@ -59,6 -59,7 +60,6 @@@
    * New error system.
    * New flow control for messages means faster get/set calls.
    * Added new documentation system.
 -  * A behavior change has been now made that if you specify a weight for any server, we enable the weight flag and do weight balancing.
    * A behavior change has been now made that if you specify a weight for any server, we enable the weight flag and do weight balancing.  
    * Added MEMCACHED_BEHAVIOR_REMOVE_FAILED_SERVERS to simplify the setting of AUTO REJECT for servers.