Merge branch '0.9.x' into 1.0.x

diff --cc classes/Memcached_DataObject.php
index d26a6a5eae027a64630cdcc0e1f6b80c1cb0ceb6,0836c2019f82486232f196a977b25f0563318f5d..85273a9b7a265734f4fffadd0f6759722833dc53
--- 1/classes/Memcached_DataObject.php
--- 2/classes/Memcached_DataObject.php
+++ b/classes/Memcached_DataObject.php
@@@ -570,9 -570,12 +570,12 @@@ class Memcached_DataObject extends Safe
      function raiseError($message, $type = null, $behaviour = null)
      {
          $id = get_class($this);
 -        if ($this->id) {
 +        if (!empty($this->id)) {
              $id .= ':' . $this->id;
          }
+         if ($message instanceof PEAR_Error) {
+             $message = $message->getMessage();
+         }
          throw new ServerException("[$id] DB_DataObject error [$type]: $message");
      }
  

diff --cc lib/default.php
Simple merge