Merge branch 'testing' into 1.0.x

diff --cc classes/Notice.php
index 6eb4d9001e4c032f66d78ba8cac8f4f46c1c5a1d,e82b567e9c7b34e5b4286d553d71006d8503c923..650dca051b359727ec00cc64c8f44b07cd280a3e
--- 1/classes/Notice.php
--- 2/classes/Notice.php
+++ b/classes/Notice.php
@@@ -84,9 -84,14 +84,14 @@@ class Notice extends Memcached_DataObje
      /* the code above is auto generated do not remove the tag below */
      ###END_AUTOCODE
  
+       function multiGet($kc, $kvs, $skipNulls=true)
+       {
+               return Memcached_DataObject::multiGet('Notice', $kc, $kvs, $skipNulls);
+       }
+       
      /* Notice types */
      const LOCAL_PUBLIC    =  1;
 -    const REMOTE_OMB      =  0;
 +    const REMOTE          =  0;
      const LOCAL_NONPUBLIC = -1;
      const GATEWAY         = -2;
  

diff --cc lib/router.php
Simple merge

diff --cc plugins/Bookmark/BookmarkPlugin.php
Simple merge