diff --git a/Makefile b/Makefile
index 8a42949f..65f1f0ba 100644
--- a/Makefile
+++ b/Makefile
@@ -30,7 +30,7 @@ update:
 	echo "remember that pymysql was tweaked"
 src:
 	### Use semantic versioning
-	echo 'Version 2.9.5-stable+timestamp.'`date +%Y.%m.%d.%H.%M.%S` > VERSION
+	echo 'Version 2.9.5-trunk+timestamp.'`date +%Y.%m.%d.%H.%M.%S` > VERSION
 	### rm -f all junk files
 	make clean
 	### clean up baisc apps
diff --git a/VERSION b/VERSION
index 27ca05c0..d41a2966 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-Version 2.9.5-stable+timestamp.2014.03.22.02.22.24
+Version 2.9.5-trunk+timestamp.2014.03.28.21.24.22
diff --git a/gluon/dal.py b/gluon/dal.py
index 70522306..30ae4e63 100644
--- a/gluon/dal.py
+++ b/gluon/dal.py
@@ -5212,13 +5212,17 @@ class GoogleDatastoreAdapter(NoSQLAdapter):
                     else:
                         order={'-id':'-__key__','id':'__key__'}.get(order,order)
                         items = items.order(order)
+
             if args_get('limitby', None):
+
                 (lmin, lmax) = attributes['limitby']
                 (limit, offset) = (lmax - lmin, lmin)
                 if self.use_ndb:
-                    rows, cursor, more = items.fetch_page(limit,offset=offset)
+                    rows, cursor, more = items.fetch_page(limit,offset=offset,keys_only=True)
                 else:
-                    rows =  items.fetch(limit,offset=offset)
+                    rows =  items.fetch(limit,offset=offset,keys_only=True)
+                
+                rows = ndb.get_multi(rows) if self.use_ndb else gae.get(rows)
                 #cursor is only useful if there was a limit and we didn't return
                 # all results
                 if args_get('reusecursor'):