Merge branch 'locshunt2' into 0.9.x

Conflicts:
	classes/User_location_prefs.php

1 files changed, 5 insertions, 0 deletions

diff --git a/classes/User_location_prefs.php b/classes/User_location_prefs.php
index 52cb254ba..bd6029f97 100644
--- a/classes/User_location_prefs.php
+++ b/classes/User_location_prefs.php
@@ -45,4 +45,9 @@ class User_location_prefs extends Memcached_DataObject
 
     /* the code above is auto generated do not remove the tag below */
     ###END_AUTOCODE
+
+    function sequenceKey()
+    {
+        return array(false, false, false);
+    }
 }