*** appscale_server_787.5.4.py	2012-05-08 13:16:38.000000000 -0700
--- appscale_server.py	2012-05-08 13:25:54.000000000 -0700
***************
*** 519,524 ****
--- 519,525 ----
      else:
        global app_datastore
        results=[]
+       versions=[]
  
        if query.has_transaction():
          txn = query.transaction()
***************
*** 559,572 ****
            res = []
  
          # odds are versions
!         versions = res[1::2]
          # evens are encoded entities
          res = res[0::2]  
!         if len(versions) != len(res):
            return(api_base_pb.VoidProto().Encode(),
                   datastore_pb.Error.INTERNAL_ERROR,
                   'The query had a bad number of results.')
          results.extend(res)
        # convert to objects
        # Unless its marked as deleted
        # They are currently strings
--- 560,574 ----
            res = []
  
          # odds are versions
!         ver = res[1::2]
          # evens are encoded entities
          res = res[0::2]  
!         if len(ver) != len(res):
            return(api_base_pb.VoidProto().Encode(),
                   datastore_pb.Error.INTERNAL_ERROR,
                   'The query had a bad number of results.')
          results.extend(res)
+         versions.extend(ver)
        # convert to objects
        # Unless its marked as deleted
        # They are currently strings